diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.de.po b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
index 191cf10c4583a1706c0ad4dae0158fc9d6122e55..7b70458e119d8cbae55870cb76ebf9f12b41067f 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: 2017-02-09 20:59+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -16,6 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.10\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
+msgstr "<div class=\"trophy windows linux mac\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
@@ -54,16 +85,6 @@ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -101,13 +122,22 @@ msgstr ""
 "Die URL dieser Seite aufzuschreiben, damit Sie später wiederkommen können:"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| "     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 msgid ""
 "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -124,11 +154,15 @@ msgstr ""
 "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/index.de.html#back`</span>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Starten Sie mit dem vorübergehenden Tails neu</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Starten Sie mit dem anderen Tails neu</h1>\n"
@@ -145,23 +179,17 @@ msgstr "<div class=\"step-image\">\n"
 msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"]]\n"
 
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -169,24 +197,27 @@ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
 msgstr "<div class=\"note clone\">\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -198,14 +229,24 @@ msgstr ""
 "<span class=\"upgrade\">aktualisieren</span>.</p>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| "     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| "   </p>\n"
+#| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
+#| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"upgrade\">upgrade</span>\n"
+#| "   from.</p>\n"
+#| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -224,35 +265,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr "Schalten Sie den Computer ein."
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Wahl</span>-Taste (<span class=\"keycap\">Alt</span>-Taste), bis eine Liste der möglichen Datenträger\n"
-"   erscheint, von denen gestartet werden kann.</p>\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Enter</span>. Die DVD\n"
-"   wird möglicherweise, wie im folgenden Bildschirmfoto, als <span class=\"guilabel\">Windows</span> bezeichnet:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Bildschirm mit dem Logo einer internen mit 'Macintosh HD' bezeichneten Festplatte und einer mit 'Windows' bezeichnete DVD (ausgewählt)\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -268,16 +280,6 @@ msgstr "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline.de\" raw
 msgid "   </div>\n"
 msgstr "   </div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 #, fuzzy
 #| msgid ""
@@ -306,10 +308,10 @@ msgstr ""
 #| "   about Tails not starting at all\"]].</p>\n"
 #| "   </div>\n"
 msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -359,49 +361,17 @@ msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\
 msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schwarzer Bildschirm mit Tails-Hintergrund. 'Boot-Menü' mit den Optionen 'Live' und 'Live (failsafe)'.\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>Wenn Ihr Computer das vorübergehende Tails nicht startet, können Sie\n"
-"   diese zwei anderen Vorgehensweisen versuchen:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/dvd]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Installation von einem anderen Betriebssystem aus|install]]</li>\n"
-"     <li class=\"mac-usb mac-clone\">[[Eine DVD brennen und anschließend installieren|mac/dvd]]</li>\n"
-"     <li class=\"mac-clone\">[[Von der Kommandozeile aus installieren|mac/usb]]</li>\n"
-"   </ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
-"   <p>Wenn Sie diese bereits versucht haben und dabei gescheitert sind, ist\n"
-"   es derzeit möglicherweise unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
 "   <p>Wenn Ihr Computer beim Starten von der Tails-DVD fehlschlägt, ist es möglicherweise derzeit\n"
 "   unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
 "   </div>\n"
@@ -639,30 +609,90 @@ msgstr "Nach 15&ndash;30 Sekunden erscheint der Tails Desktop."
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr "<div class=\"trophy windows linux mac\">\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-"<p class=\"usb\">Der schwierigste Teil ist geschafft!\n"
-"Holen Sie nun Ihren zweiten USB-Stick, da es an der Zeit ist, das eigentliche Tails darauf zu installieren.</p>\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""
-"<p class=\"usb\">Es ist wichtig, das endgültige Tails zu installieren, da\n"
-"Sie dadurch Ihre Dokumente und Konfigurationen speichern\n"
-"und von automatischen Sicherheitsaktualisierungen profitieren können.</p>\n"
+#, fuzzy
+#~| msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
+#~ msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
+
+#, fuzzy
+#~| msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
+#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Wahl</span>-Taste (<span class=\"keycap\">Alt</span>-Taste), bis eine Liste der möglichen Datenträger\n"
+#~ "   erscheint, von denen gestartet werden kann.</p>\n"
+
+#, fuzzy
+#~| msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
+#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Enter</span>. Die DVD\n"
+#~ "   wird möglicherweise, wie im folgenden Bildschirmfoto, als <span class=\"guilabel\">Windows</span> bezeichnet:</p>\n"
+
+#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Bildschirm mit dem Logo einer internen mit 'Macintosh HD' bezeichneten Festplatte und einer mit 'Windows' bezeichnete DVD (ausgewählt)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Wenn Ihr Computer das vorübergehende Tails nicht startet, können Sie\n"
+#~ "   diese zwei anderen Vorgehensweisen versuchen:</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
+#~ "     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/dvd]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installation von einem anderen Betriebssystem aus|install]]</li>\n"
+#~ "     <li class=\"mac-usb mac-clone\">[[Eine DVD brennen und anschließend installieren|mac/dvd]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Von der Kommandozeile aus installieren|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Wenn Sie diese bereits versucht haben und dabei gescheitert sind, ist\n"
+#~ "   es derzeit möglicherweise unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Der schwierigste Teil ist geschafft!\n"
+#~ "Holen Sie nun Ihren zweiten USB-Stick, da es an der Zeit ist, das eigentliche Tails darauf zu installieren.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Es ist wichtig, das endgültige Tails zu installieren, da\n"
+#~ "Sie dadurch Ihre Dokumente und Konfigurationen speichern\n"
+#~ "und von automatischen Sicherheitsaktualisierungen profitieren können.</p>\n"
 
 #, fuzzy
 #~| msgid ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.es.po b/wiki/src/install/inc/steps/restart_first_time.inline.es.po
index 4fe3cc9a3b09cd2e0384107186e92f9c0d4d4344..ff0121d8f95a5639abd07ac509896105d4bcae53 100755
--- a/wiki/src/install/inc/steps/restart_first_time.inline.es.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: 2018-05-11 16:15+0000\n"
 "Last-Translator: Tails translators <amnesia@boum.org>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -18,6 +18,37 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.10.1\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
+msgstr "<div class=\"trophy windows linux mac\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
@@ -56,16 +87,6 @@ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -103,13 +124,22 @@ msgstr ""
 "Tomes nota de la dirección URL de esta página para poder volver a ella luego:"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| "     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 msgid ""
 "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -126,11 +156,15 @@ msgstr ""
 "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Reinicia en el Tails intermediario</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Reinicia en otro Tails</h1>\n"
@@ -147,43 +181,43 @@ msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"cl
 msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"Memoria USB conectada en la izquierda\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computadora reiniciada en la memoria USB en la derecha\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computadora reiniciada en DVD\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Memoria USB desconectada en la derecha y computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
 msgstr "<div class=\"note clone\">\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -196,14 +230,24 @@ msgstr ""
 "desde un DVD de Tails de un modo similar.</p>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| "     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| "   </p>\n"
+#| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
+#| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"upgrade\">upgrade</span>\n"
+#| "   from.</p>\n"
+#| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -222,33 +266,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr "Enciende la computadora."
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Opción</span> (<span class=\"keycap\">Alt</span> key) hasta que aparezca la lista de discos de arranque.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Tecla 'opción' o 'alt' en la parte inferior izquierda del teclado de Mac\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Enter</span>. El DVD\n"
-"   puede estar etiquetado como <span class=\"guilabel\">Windows</span> como en la siguiente captura de pantalla:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Pantalla con el logo de un disco duro interno etiquetado 'Macintosh HD' y un DVD etiquetado 'Windows' (seleccionado)\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -257,31 +274,13 @@ msgstr "   <div class=\"mac-usb mac-clone\">\n"
 #. type: Plain text
 #, no-wrap
 msgid "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\""
-" sort=\"age\"]]\n"
+msgstr "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "   </div>\n"
 msgstr "   </div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-"   <div class=\"bug mac\">\n"
-"   <p>Si solo aparece tu disco duro Macintosh, puedes intentar\n"
-"   reinstalando un Tails intermedio desde [[Windows usando\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>"
-"\n"
-"   </div>\n"
-
 #. type: Bullet: '1. '
 msgid ""
 "If the computer starts on Tails, the <span class=\"application\">Boot Loader "
@@ -292,12 +291,23 @@ msgstr ""
 "segundos.</p>"
 
 #. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <div class=\"note install-clone debian expert windows linux\">\n"
+#| "   <p>Most computers do not start on Tails by default. If it does you\n"
+#| "   are lucky. Otherwise, if the computer starts on\n"
+#| "   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+#| "   <span class=\"windows\">Windows,</span>\n"
+#| "   <span class=\"linux\">Linux,</span>\n"
+#| "   <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| "   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| "   about Tails not starting at all\"]].</p>\n"
+#| "   </div>\n"
+msgid ""
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -346,46 +356,17 @@ msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\
 msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Pantalla negra con el logo de Tails. Menú de arranque con dos opciones 'Tails' y 'Tails (Modo seguro)'.\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>Si tu computadora falla al iniciar en el Tails intermedio, puedes\n"
-"   intentar estos otros dos métodos:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Instalar desde otro sistema operativo|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</li>\n"
-"   </ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
-"   <p>Si ya lo has intentado sin lograrlo, tal vez sea imposible arrancar Tails desde tu modelo de Mac.</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
 "   <p>Si tu computador no arranca desde el DVD Tails, tal vez sea imposible por ahora arrancar Tails desde tu modelo de Mac.</p>\n"
 "   </div>\n"
 
@@ -394,8 +375,8 @@ msgid ""
 "After 30&ndash;60 seconds, another screen called <span class=\"application"
 "\">Tails Greeter</span> appears."
 msgstr ""
-"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class=\""
-"application\">Tails Greeter</span>."
+"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class="
+"\"application\">Tails Greeter</span>."
 
 #. type: Plain text
 #, no-wrap
@@ -409,8 +390,7 @@ msgstr ""
 "   <div class=\"note\">\n"
 "   <p>Si la computadora muestra el mensaje de error\n"
 "   <span class=\"guilabel\">Error iniciando GDM con tu tarjeta\n"
-"   gráfica</span>, revisa nuestra [[lista de problemas conocidos con "
-"tarjetas\n"
+"   gráfica</span>, revisa nuestra [[lista de problemas conocidos con tarjetas\n"
 "   gráficas|support/known_issues/graphics]].</p>\n"
 
 #. type: Plain text
@@ -506,9 +486,9 @@ msgid ""
 "\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
 "add this option to the command line."
 msgstr ""
-"Si Tails falló previamente al iniciar y mostró el error <span class=\"code\">"
-"Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para agregar "
-"esta opción a la línea de comandos."
+"Si Tails falló previamente al iniciar y mostró el error <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para "
+"agregar esta opción a la línea de comandos."
 
 #. type: Bullet: '   1. '
 msgid "Type `debug nosplash` to add these options to the command line."
@@ -598,30 +578,92 @@ msgstr "Luego de 15&ndash;30 segundos, el escritorio de Tails aparecerá."
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"EscritorioTails\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr "<div class=\"trophy windows linux mac\">\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-"<p class=\"usb\">La parte más difícil ya está hecha!\n"
-"Ahora toma la segunda memoria USB, que ya es tiempo de instalar el Tails final en ella.</p>\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""
-"<p class=\"usb\">Es importante instalar el Tails final porque permite\n"
-"guardar algunos de tus documentos y configuraciones\n"
-"y beneficiarte de las actualizaciones de seguridad automáticas.</p>\n"
+#~ msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computadora reiniciada en la memoria USB en la derecha\"]]\n"
+
+#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computadora reiniciada en DVD\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr "   <span class=\"keycap\">Opción</span> (<span class=\"keycap\">Alt</span> key) hasta que aparezca la lista de discos de arranque.</p>\n"
+
+#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Tecla 'opción' o 'alt' en la parte inferior izquierda del teclado de Mac\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Enter</span>. El DVD\n"
+#~ "   puede estar etiquetado como <span class=\"guilabel\">Windows</span> como en la siguiente captura de pantalla:</p>\n"
+
+#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Pantalla con el logo de un disco duro interno etiquetado 'Macintosh HD' y un DVD etiquetado 'Windows' (seleccionado)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
+#~ "   reinstalling an intermediary Tails from [[Windows using\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>Si solo aparece tu disco duro Macintosh, puedes intentar\n"
+#~ "   reinstalando un Tails intermedio desde [[Windows usando\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Si tu computadora falla al iniciar en el Tails intermedio, puedes\n"
+#~ "   intentar estos otros dos métodos:</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Instalar desde otro sistema operativo|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Si ya lo has intentado sin lograrlo, tal vez sea imposible arrancar Tails desde tu modelo de Mac.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La parte más difícil ya está hecha!\n"
+#~ "Ahora toma la segunda memoria USB, que ya es tiempo de instalar el Tails final en ella.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Es importante instalar el Tails final porque permite\n"
+#~ "guardar algunos de tus documentos y configuraciones\n"
+#~ "y beneficiarte de las actualizaciones de seguridad automáticas.</p>\n"
 
 #~ msgid ""
 #~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
index b4c8144af17e7405f69c10241a41aeacade312aa..901f674d387b7e799dad8503d4d5cdc97c534610 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,67 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"In the next step, you will shut down the computer. To be able to follow the "
-"rest of the instructions afterwards, we recommend you either:"
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In the next step, you will shut down the computer. To be able to follow the "
+"rest of the instructions afterwards, we recommend you either:"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\" alt=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -102,7 +121,6 @@ msgid ""
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -112,9 +130,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 
 #. type: Plain text
@@ -129,17 +147,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -147,11 +160,6 @@ msgstr ""
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
@@ -161,10 +169,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -173,11 +181,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -187,30 +195,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -226,16 +210,6 @@ msgstr ""
 msgid "   </div>\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 msgid ""
 "If the computer starts on Tails, the <span class=\"application\">Boot Loader "
@@ -245,10 +219,10 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -288,36 +262,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/dvd]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 msgid ""
 "After 30&ndash;60 seconds, another screen called <span class=\"application"
@@ -478,23 +427,3 @@ msgstr ""
 #, no-wrap
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
index 451a20c32b5e0770ea45372b0476e5c2ef3c2a57..4f4335b5184b0b93405c92366562686bbd75ba97 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: 2018-04-20 11:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -16,6 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
+msgstr "<div class=\"trophy windows linux mac\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
@@ -54,16 +85,6 @@ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -100,13 +121,22 @@ msgid "Take note of the URL of this page to be able to come back later:"
 msgstr "Noter l'adresse de cette page pour pouvoir y revenir plus tard :"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| "     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 msgid ""
 "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -123,11 +153,15 @@ msgstr ""
 "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/index.fr.html#back`</span>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Redémarrer sur le Tails intermédiaire</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Redémarrer sur l'autre Tails</h1>\n"
@@ -144,43 +178,43 @@ msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"cl
 msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Ordinateur redémarrant sur un DVD\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Clé USB débranchée sur la droite et ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
 msgstr "<div class=\"note clone\">\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -193,14 +227,24 @@ msgstr ""
 "depuis un DVD Tails de façon similaire.</p>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| "     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| "   </p>\n"
+#| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
+#| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"upgrade\">upgrade</span>\n"
+#| "   from.</p>\n"
+#| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -218,34 +262,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr "Allumer l'ordinateur."
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Option</span> (touche <span class=\"keycap\">Alt</span>) jusqu'à ce qu'une liste de disques\n"
-"   de démarrage apparaisse.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Touche 'Option' ou 'alt' en bas à gauche du clavier Mac\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Entrée</span>. Le DVD\n"
-"   devrait être nommé <span class=\"guilabel\">Windows</span> comme sur la capture d'écran suivante :</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Écran avec le logo d'un disque dur interne nommé 'Macintosh HD' et un DVD nommé 'Windows' (sélectionné)\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -261,21 +277,6 @@ msgstr "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline.fr\" raw
 msgid "   </div>\n"
 msgstr "   </div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-"   <div class=\"bug mac\">\n"
-"   <p>Si votre disque dur Macintosh est le seul à apparaître, vous pouvez essayer\n"
-"   de réinstaller un Tails intermédiaire depuis [[Windows en utilisant\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-
 #. type: Bullet: '1. '
 msgid ""
 "If the computer starts on Tails, the <span class=\"application\">Boot Loader "
@@ -286,12 +287,23 @@ msgstr ""
 "secondes.</p>"
 
 #. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <div class=\"note install-clone debian expert windows linux\">\n"
+#| "   <p>Most computers do not start on Tails by default. If it does you\n"
+#| "   are lucky. Otherwise, if the computer starts on\n"
+#| "   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+#| "   <span class=\"windows\">Windows,</span>\n"
+#| "   <span class=\"linux\">Linux,</span>\n"
+#| "   <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| "   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| "   about Tails not starting at all\"]].</p>\n"
+#| "   </div>\n"
+msgid ""
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -340,47 +352,17 @@ msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\
 msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Écran noir avec le logo de Tails. Menu du chargeur d’amorçage avec deux options 'Tails' et 'Tails (Troubleshooting Mode)'.\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>Si votre ordinateur ne démarre pas sur le Tails intermédiaire, vous pouvez\n"
-"   essayer ces deux autres méthodes :</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Installer depuis un autre système d'exploitation|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Installer depuis la ligne de commande|mac/usb]]</li>\n"
-"   </ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
-"   <p>Si vous essayez une nouvelle fois mais échouez également, alors il est peut-être\n"
-"   actuellement impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
 "   <p>Si votre ordinateur n'arrive pas à démarrer sur le DVD Tails, alors il est peut-être actuellement\n"
 "   impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
 "   </div>\n"
@@ -598,27 +580,92 @@ msgstr "Après 15&ndash;30 secondes, le bureau de Tails apparaît."
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau Tails\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr "<div class=\"trophy windows linux mac\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-"<p class=\"usb\">La partie la plus difficile est passée !\n"
-"Maintenant emparez-vous de votre seconde clé USB car il est temps d'installer le Tails définitif dessus.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""
-"<p class=\"usb\">Il est important d'installer le Tails définitif pour que vous\n"
-"puissiez stocker certains de vos documents et configurations\n"
-"et bénéficier des mises à jour de sécurité automatiques.</p>\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+
+#~ msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite\"]]\n"
+
+#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
+#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Ordinateur redémarrant sur un DVD\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Option</span> (touche <span class=\"keycap\">Alt</span>) jusqu'à ce qu'une liste de disques\n"
+#~ "   de démarrage apparaisse.</p>\n"
+
+#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Touche 'Option' ou 'alt' en bas à gauche du clavier Mac\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Entrée</span>. Le DVD\n"
+#~ "   devrait être nommé <span class=\"guilabel\">Windows</span> comme sur la capture d'écran suivante :</p>\n"
+
+#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Écran avec le logo d'un disque dur interne nommé 'Macintosh HD' et un DVD nommé 'Windows' (sélectionné)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
+#~ "   reinstalling an intermediary Tails from [[Windows using\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>Si votre disque dur Macintosh est le seul à apparaître, vous pouvez essayer\n"
+#~ "   de réinstaller un Tails intermédiaire depuis [[Windows en utilisant\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Si votre ordinateur ne démarre pas sur le Tails intermédiaire, vous pouvez\n"
+#~ "   essayer ces deux autres méthodes :</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installer depuis un autre système d'exploitation|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Installer depuis la ligne de commande|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Si vous essayez une nouvelle fois mais échouez également, alors il est peut-être\n"
+#~ "   actuellement impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La partie la plus difficile est passée !\n"
+#~ "Maintenant emparez-vous de votre seconde clé USB car il est temps d'installer le Tails définitif dessus.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Il est important d'installer le Tails définitif pour que vous\n"
+#~ "puissiez stocker certains de vos documents et configurations\n"
+#~ "et bénéficier des mises à jour de sécurité automatiques.</p>\n"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.it.po b/wiki/src/install/inc/steps/restart_first_time.inline.it.po
index c335650b7ec60d80d33ee5d331b1859c3610bb1f..8887a488d3ee9058f673ed5569f3d69ac4f6e2bd 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.it.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: 2017-02-09 21:00+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -16,6 +16,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
+msgstr "<div class=\"trophy windows linux mac\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
@@ -38,39 +69,23 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-"   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class"
-"=\"install-clone qrcode\" link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class=\"install-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-"   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\""
-"windows qrcode\" link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class=\"windows qrcode\" link=\"no\" alt=\"\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-"   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-"
-"usb qrcode\" link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class=\"mac-usb qrcode\" link=\"no\" alt=\"\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -107,12 +122,22 @@ msgstr ""
 "Prendi nota dell'indirizzo di questa pagina per poterci tornare più tardi:"
 
 #. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| "     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 msgid ""
 "     <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -129,11 +154,15 @@ msgstr ""
 "     <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Riavvia sulla Tails intermediaria</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Riavvia su un'altra Tails</h1>\n"
@@ -151,43 +180,43 @@ msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"cl
 msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
 msgstr "<div class=\"note clone\">\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -200,14 +229,24 @@ msgstr ""
 "da un DVD Tails in modo simile.</p>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| "     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| "   </p>\n"
+#| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
+#| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"upgrade\">upgrade</span>\n"
+#| "   from.</p>\n"
+#| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -226,35 +265,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr "Riaccendi il computer."
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Opzione</span> (<span class=\"keycap\">Alt</span> key) finché non appare una lista di\n"
-"   possibili dischi d'avvio.</p>\n"
-"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-"   <span class=\"keycap\">Invio</span>. Il DVD\n"
-"   potrebbe essere etichettato <span class=\"guilabel\">Windows</span> come nello screenshot seguente:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Schermo con il logo di un hard disk interno etichettato 'Macintosh HD' e un DVD etichettato 'Windows' (selezionato)\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -263,25 +273,13 @@ msgstr "   <div class=\"mac-usb mac-clone\">\n"
 #. type: Plain text
 #, no-wrap
 msgid "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline.it\" raw=\""
-"yes\" sort=\"age\"]]\n"
+msgstr "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "   </div>\n"
 msgstr "   </div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 #, fuzzy
 #| msgid ""
@@ -297,12 +295,23 @@ msgstr ""
 "<span class=\"keycap\">Invio</span>"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <div class=\"note install-clone debian expert windows linux\">\n"
+#| "   <p>Most computers do not start on Tails by default. If it does you\n"
+#| "   are lucky. Otherwise, if the computer starts on\n"
+#| "   <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
+#| "   <span class=\"windows\">Windows,</span>\n"
+#| "   <span class=\"linux\">Linux,</span>\n"
+#| "   <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| "   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| "   about Tails not starting at all\"]].</p>\n"
+#| "   </div>\n"
 msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -310,6 +319,16 @@ msgid ""
 "   about Tails not starting at all\"]].</p>\n"
 "   </div>\n"
 msgstr ""
+"   <div class=\"note install-clone debian expert windows linux\">\n"
+"   <p>La maggior parte dei computer non si avvia su Tails di default. Se succede\n"
+"   sei fortunata. Altrimenti, se il computer si avvia su\n"
+"   <span class=\"debian expert\">Debian o Ubuntu,</span>\n"
+"   <span class=\"windows\">Windows,</span>\n"
+"   <span class=\"linux\">Linux,</span>\n"
+"   <span class=\"install-clone\">Windows o Linux,</span>\n"
+"   fai riferimento  [[!toggle id=\"not_at_all\" text=\"alla sezione sulla risoluzioni di problemi \n"
+"   per quando Tails non si avvia per niente\"]].</p>\n"
+"   </div>\n"
 
 #. type: Plain text
 #, no-wrap
@@ -342,47 +361,17 @@ msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\
 msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schermo nero con il disegno di Tails. 'Menù di avvio' con due opzioni, 'Live' e 'Live (failsafe)'.\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>Se il tuo computer non si avvia sulla Tails intermediaria, puoi\n"
-"   provare questi altri due metodi:</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Installa da un altro sistema operativo|install]]</li>\n"
-"     <li class=\"mac-clone\">[[Installa dalla riga di comando|mac/usb]]</li>\n"
-"   </ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
-"   <p>Se le hai già trovate ma hai comunque fallito, potrebbe essere\n"
-"   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
 "   <p>Se il tuo computer non si avvia dal DVD Tails, potrebbe essere\n"
 "   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
 "   </div>\n"
@@ -614,30 +603,68 @@ msgstr "Dopo 15&ndash;30 secondi, ti apparirà il Desktop di Tails."
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr "<div class=\"trophy windows linux mac\">\n"
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Opzione</span> (<span class=\"keycap\">Alt</span> key) finché non appare una lista di\n"
+#~ "   possibili dischi d'avvio.</p>\n"
+#~ "\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-"<p class=\"usb\">La parte più difficile è finita!\n"
-"Ora prendi la tua seconda chiave USB perché è tempo di installarci sopra la Tails finale.</p>\n"
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Invio</span>. Il DVD\n"
+#~ "   potrebbe essere etichettato <span class=\"guilabel\">Windows</span> come nello screenshot seguente:</p>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""
-"<p class=\"usb\">E' importante installare la Tails finale perché ti\n"
-"consente di archiviare alcuni dei tuoi documenti e configurazioni\n"
-"e beneficia di aggiornamenti di sicurezza automatici.</p>\n"
+#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Schermo con il logo di un hard disk interno etichettato 'Macintosh HD' e un DVD etichettato 'Windows' (selezionato)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Se il tuo computer non si avvia sulla Tails intermediaria, puoi\n"
+#~ "   provare questi altri due metodi:</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installa da un altro sistema operativo|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Installa dalla riga di comando|mac/usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Se le hai già trovate ma hai comunque fallito, potrebbe essere\n"
+#~ "   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La parte più difficile è finita!\n"
+#~ "Ora prendi la tua seconda chiave USB perché è tempo di installarci sopra la Tails finale.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">E' importante installare la Tails finale perché ti\n"
+#~ "consente di archiviare alcuni dei tuoi documenti e configurazioni\n"
+#~ "e beneficia di aggiornamenti di sicurezza automatici.</p>\n"
 
 #~ msgid ""
 #~ "<div class=\"step-image\">[[!img install/inc/infography/switch-context."
@@ -675,11 +702,11 @@ msgstr ""
 #~ "\"mac-clone qrcode\" link=\"no\"]]\n"
 
 #~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="
-#~ "\" qrcode\" link=\"no\"]]\n"
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\"]]\n"
 #~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="
-#~ "\" qrcode\" link=\"no\"]]\n"
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\"]]\n"
 
 #~ msgid ""
 #~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
@@ -730,13 +757,6 @@ msgstr ""
 #~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
 #~ "\"debian\"]]\n"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-other-tails.png link=\"no"
-#~ "\" class=\"clone windows linux mac-usb\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-other-tails.png link=\"no"
-#~ "\" class=\"clone windows linux mac-usb\"]]\n"
-
 #~ msgid ""
 #~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-"
 #~ "dvd\"]]\n"
@@ -752,37 +772,11 @@ msgstr ""
 #~ "class=\"upgrade-tails\"]]\n"
 
 #~ msgid ""
-#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\""
-#~ "\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\""
-#~ "\" link=\"no\"]]\n"
-
-#~ msgid ""
-#~ "   <div class=\"note install-clone debian expert windows linux\">\n"
-#~ "   <p>Most computers do not start on Tails by default. If it does you\n"
-#~ "   are lucky. Otherwise, if the computer starts on\n"
-#~ "   <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
-#~ "   <span class=\"windows\">Windows,</span>\n"
-#~ "   <span class=\"linux\">Linux,</span>\n"
-#~ "   <span class=\"install-clone\">Windows or Linux,</span>\n"
-#~ "   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting "
-#~ "section\n"
-#~ "   about Tails not starting at all\"]].</p>\n"
-#~ "   </div>\n"
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\"]]\n"
 #~ msgstr ""
-#~ "   <div class=\"note install-clone debian expert windows linux\">\n"
-#~ "   <p>La maggior parte dei computer non si avvia su Tails di default. Se "
-#~ "succede\n"
-#~ "   sei fortunata. Altrimenti, se il computer si avvia su\n"
-#~ "   <span class=\"debian expert\">Debian o Ubuntu,</span>\n"
-#~ "   <span class=\"windows\">Windows,</span>\n"
-#~ "   <span class=\"linux\">Linux,</span>\n"
-#~ "   <span class=\"install-clone\">Windows o Linux,</span>\n"
-#~ "   fai riferimento  [[!toggle id=\"not_at_all\" text=\"alla sezione sulla "
-#~ "risoluzioni di problemi \n"
-#~ "   per quando Tails non si avvia per niente\"]].</p>\n"
-#~ "   </div>\n"
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\"]]\n"
 
 #~ msgid ""
 #~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
@@ -791,9 +785,5 @@ msgstr ""
 #~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
 #~ "link=\"no\"]]\n"
 
-#~ msgid ""
-#~ "   [[!img install/inc/screenshots/desktop.png link="
-#~ "\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/screenshots/desktop.png link="
-#~ "\"no\"]]\n"
+#~ msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
index 3b988be5c5f2f077ac75b50c6febb3d4565b9ad1..a450b445143148c735f581632c3ac76b3c4ecd51 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-11-11 14:50+0000\n"
 "PO-Revision-Date: 2018-02-21 10:55+0000\n"
 "Last-Translator: Tails translators <amnesia@boum.org\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,37 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.10.1\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows linux mac-usb expert\">\n"
+msgstr "<div class=\"trophy windows linux mac\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "<div class=\"state-image\">[[!img install/inc/infography/tails-usb.png link=\"no\" alt=\"Tails USB stick\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Congratulations, you have installed Tails on your USB stick!</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>You will now restart your computer on this USB stick.\n"
+"<span class=\"windows linux expert\">It can be a bit complicated, so good luck!</span>\n"
+"<span class=\"mac-usb\">But it might not work on your Mac model, so good luck!</span>\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "<h1 id=\"back\">Open these instructions on another device</h1>\n"
@@ -25,9 +56,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-"<div class=\"step-image\">[[!img install/inc/infography/switch-context.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
 
 #. type: Plain text
 msgid ""
@@ -55,16 +84,6 @@ msgstr ""
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class=\"mac-clone qrcode\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -105,7 +124,6 @@ msgid ""
 "     <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
 "     <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
 "     <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
-"     <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
 "     <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
 "     <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
 "     <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -115,9 +133,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"upgrade-tails\">Restart on the intermediary Tails</h1>\n"
 "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"windows linux mac-usb expert\">Restart on Tails</h1>\n"
 msgstr ""
 
 #. type: Plain text
@@ -132,17 +150,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -150,11 +163,6 @@ msgstr ""
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "<div class=\"note clone\">\n"
@@ -164,10 +172,10 @@ msgstr "<div class=\"note clone\">\n"
 #, no-wrap
 msgid ""
 "<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
 "<span class=\"upgrade\">upgrading</span>\n"
 "from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
 "<span class=\"upgrade\">upgrade</span>\n"
 "from a Tails DVD in a similar way.</p>\n"
 msgstr ""
@@ -176,11 +184,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+"   <span class=\"install-clone windows linux mac\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -190,30 +198,6 @@ msgstr ""
 msgid "Switch on the computer."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-"   disks appears.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <span class=\"keycap\">Enter</span>. The DVD\n"
-"   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "   <div class=\"mac-usb mac-clone\">\n"
@@ -229,16 +213,6 @@ msgstr ""
 msgid "   </div>\n"
 msgstr "   </div>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac\">\n"
-"   <p>If only your Macintosh hard drive appears, you can try\n"
-"   reinstalling an intermediary Tails from [[Windows using\n"
-"   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 msgid ""
 "If the computer starts on Tails, the <span class=\"application\">Boot Loader "
@@ -248,10 +222,10 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   <div class=\"note install-clone debian expert windows linux\">\n"
+"   <div class=\"note install-clone expert windows linux\">\n"
 "   <p>Most computers do not start on Tails by default. If it does you\n"
 "   are lucky. Otherwise, if the computer starts on\n"
-"   <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
 "   <span class=\"windows\">Windows,</span>\n"
 "   <span class=\"linux\">Linux,</span>\n"
 "   <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -291,36 +265,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the intermediary Tails, you can\n"
-"   try these other two methods:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <ul>\n"
-"     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-"     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/dvd]]</li>\n"
-"     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-"   </ul>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If you tried them already but failed as well, then it might\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
 "   currently be impossible to start Tails on your Mac model.</p>\n"
 "   </div>\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-"   be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-
 #. type: Bullet: '1. '
 msgid ""
 "After 30&ndash;60 seconds, another screen called <span class=\"application"
@@ -481,23 +430,3 @@ msgstr "Após 15&ndash;30 segundos, a área de trabalho do Tails aparece."
 #, no-wrap
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
-msgstr "<div class=\"trophy windows linux mac\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">The most difficult part is over!\n"
-"Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p class=\"usb\">It is important to install the final Tails as it allows\n"
-"you to store some of your documents and configuration\n"
-"and benefit from automatic security upgrades.</p>\n"
-msgstr ""