diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index dd66419e680b33bc983049073e07f3cdf36dee29..113009db9320ece4a118a2c20762736ec280ac21 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2018-04-04 20:23+0200\n"
 "Last-Translator: Tails translators\n"
 "Language-Team: \n"
@@ -27,25 +27,25 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac debian expert upgrade-tails\">1½ "
-#| "hours in total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span "
+#| "<span class=\"windows linux mac debian expert upgrade-tails\">1½ hours in "
+#| "total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span "
 #| "class=\"upgrade-clone\">¼ hour</span>"
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
 "<span class=\"windows linux mac\">2 Stunden insgesamt</span> <span class="
 "\"debian expert upgrade-tails\">1½ Stunden insgesamt</span> <span class="
-"\"install-clone mac-clone\">½ Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</"
-"span>"
+"\"install-clone mac-clone\">½ Stunde</span> <span class=\"upgrade-clone\">¼ "
+"Stunde</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#| "\"age\"]] to download</small>"
+#| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#| "download</small>"
 msgid ""
 "<span class=\"windows linux mac expert upgrade-tails\"> <small>[[!inline "
 "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to download</"
@@ -58,21 +58,23 @@ msgstr ""
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "</span> <span class=\"windows linux mac debian expert\"><small>½ hour "
-#| "to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+#| "</span> <span class=\"windows linux mac debian expert\"><small>½ hour to "
+#| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
 #| "upgrade</small></span>"
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
-"</span> <span class=\"windows linux mac\"><small>1 Stunde zum "
-"Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde "
-"zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ "
-"Stunde zum Aktualisieren</small></span>"
+"</span> <span class=\"windows linux mac\"><small>1 Stunde zum Installieren</"
+"small></span> <span class=\"debian expert\"><small>½ Stunde zum "
+"Installieren</small></span> <span class=\"upgrade-tails\"><small>½ Stunde "
+"zum Aktualisieren</small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -80,7 +82,9 @@ msgid "Your Tails"
 msgstr "Ihr Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -88,7 +92,9 @@ msgid "1 other Tails"
 msgstr "1 anderes Tails"
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+#, fuzzy
+#| msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr "<small>DVD oder USB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -149,7 +155,7 @@ msgstr "Ihre Schritte"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO-"
@@ -164,7 +170,7 @@ msgstr "Herunterladen"
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
@@ -173,8 +179,8 @@ msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 #| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
 #| "\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
 "alt=\"Computer neugestartet und USB-Stick zur linken Seite\"]]"
@@ -187,8 +193,8 @@ msgstr "Neustarten"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -199,7 +205,7 @@ msgstr "Installieren"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO-"
@@ -217,33 +223,32 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid ""
-#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+#| msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails auf dem USB-Stick zur rechten Seite installiert\"]]"
+"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails auf dem "
+"USB-Stick zur rechten Seite installiert\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"install-clone mac-clone\">Install</span> <span class=\"upgrade"
 "\">Upgrade</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Installieren</span> "
-"<span class=\"upgrade\">Aktualisieren</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Installieren</"
+"span> <span class=\"upgrade\">Aktualisieren</span>"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Verschlüsselung auf dem USB-Stick zur rechten Seite eingerichtet\"]]"
@@ -252,6 +257,16 @@ msgstr ""
 msgid "Configure"
 msgstr "Konfigurieren"
 
+#, fuzzy
+#~| msgid ""
+#~| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+#~ msgid ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails installed on USB stick on the right\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails auf dem USB-Stick zur rechten Seite installiert\"]]"
+
 #~ msgid "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 
@@ -267,28 +282,19 @@ msgstr "Konfigurieren"
 #~ "[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD "
 #~ "eingelegt\"]]"
 
-#, fuzzy
-#~| msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
-#~ msgid ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "installed on USB stick on the right\"]]"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails auf "
-#~ "dem USB-Stick zur rechten Seite installiert\"]]"
-
 #, fuzzy
 #~| msgid ""
-#~| "<span class=\"windows linux mac\">2 hours</span> <span class="
-#~| "\"debian expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</"
+#~| "<span class=\"windows linux mac\">2 hours</span> <span class=\"debian "
+#~| "expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</"
 #~| "span> <span class=\"upgrade-clone\">¼ hour</span>"
 #~ msgid ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</"
-#~ "span> <span class=\"debian expert\">1½ hour in total</span> <span class="
-#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</span> "
+#~ "<span class=\"debian expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#~ "hour</span>"
 #~ msgstr ""
-#~ "<span class=\"windows linux mac\">2 Stunden</span> <span class="
-#~ "\"debian expert\">1½  Stunden</span> <span class=\"install-clone mac-clone\">½ "
+#~ "<span class=\"windows linux mac\">2 Stunden</span> <span class=\"debian "
+#~ "expert\">1½  Stunden</span> <span class=\"install-clone mac-clone\">½ "
 #~ "Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>"
 
 #, fuzzy
@@ -318,17 +324,17 @@ msgstr "Konfigurieren"
 
 #, fuzzy
 #~| msgid ""
-#~| "First you will <span class=\"windows linux mac\">install an "
-#~| "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~| "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
-#~| "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
-#~| "tails\">install and upgrade an intermediary Tails.</span>"
+#~| "First you will <span class=\"windows linux mac\">install an intermediary "
+#~| "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~| "intermediary Tails on a DVD.</span> <span class=\"debian expert"
+#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone "
+#~| "mac-clone upgrade-clone\">restart on the other Tails.</span> <span class="
+#~| "\"upgrade-tails\">install and upgrade an intermediary Tails.</span>"
 #~ msgid ""
-#~ "First you will <span class=\"windows linux mac\">install an "
-#~ "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~ "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~ "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
+#~ "First you will <span class=\"windows linux mac\">install an intermediary "
+#~ "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~ "intermediary Tails on a DVD.</span> <span class=\"debian expert\">install "
+#~ "a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
 #~ "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
 #~ "tails\">install an intermediary Tails.</span>"
 #~ msgstr ""
@@ -336,22 +342,22 @@ msgstr "Konfigurieren"
 #~ "zwischenzeitliches Tails auf dem ersten USB-Stick installieren.</span> "
 #~ "<span class=\"\">ein zwischenzeitliches Tails auf einer DVD installieren."
 #~ "</span> <span class=\"debian expert\">Tails auf Ihrem USB-Stick "
-#~ "installieren.</span> <span class=\"install-clone mac-clone upgrade-clone\">das "
-#~ "andere Tails neustarten.</span> <span class=\"upgrade-tails\">ein "
+#~ "installieren.</span> <span class=\"install-clone mac-clone upgrade-clone"
+#~ "\">das andere Tails neustarten.</span> <span class=\"upgrade-tails\">ein "
 #~ "zwischenzeitliches Tails installieren und aktualisieren.</span>"
 
 #, fuzzy
 #~| msgid ""
-#~| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#~| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#~| "\"age\"]] to download</small>"
+#~| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#~| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#~| "download</small>"
 #~ msgid ""
 #~ "<span class=\"windows linux mac upgrade-tails\"><small>[[!toggle id="
 #~ "\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
 #~ msgstr ""
-#~ "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#~ "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#~ "\"age\"]] zum herunterladen</small>"
+#~ "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#~ "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] zum "
+#~ "herunterladen</small>"
 
 #, fuzzy
 #~| msgid ""
@@ -364,17 +370,17 @@ msgstr "Konfigurieren"
 #~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #~ msgid ""
-#~ "Then you will <span class=\"windows linux mac\">install the final "
-#~ "Tails on the second USB stick.</span> <span class=\"\">install the final "
-#~ "Tails on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
+#~ "Then you will <span class=\"windows linux mac\">install the final Tails "
+#~ "on the second USB stick.</span> <span class=\"\">install the final Tails "
+#~ "on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
 #~ "Tails on your USB stick.</span> <span class=\"debian expert\">configure "
 #~ "it.</span> <span class=\"upgrade-clone upgrade-tails\">upgrade your Tails."
 #~ "</span>"
 #~ msgstr ""
-#~ "Anschließend werden Sie <span class=\"windows linux mac\">das "
-#~ "endgültige Tails auf dem zweiten USB-Stick installieren.</span> <span "
-#~ "class=\"\">das endgültige Tails auf dem USB-Stick installieren.</span> "
-#~ "<span class=\"install-clone mac-clone\">Tails auf Ihren USB-Stick installieren.</"
+#~ "Anschließend werden Sie <span class=\"windows linux mac\">das endgültige "
+#~ "Tails auf dem zweiten USB-Stick installieren.</span> <span class=\"\">das "
+#~ "endgültige Tails auf dem USB-Stick installieren.</span> <span class="
+#~ "\"install-clone mac-clone\">Tails auf Ihren USB-Stick installieren.</"
 #~ "span> <span class=\"debian expert\">es konfigurieren.</span> <span class="
 #~ "\"upgrade-clone upgrade-tails\">Ihr Tails aktualisieren.</span>"
 
diff --git a/wiki/src/install/inc/overview.es.po b/wiki/src/install/inc/overview.es.po
index c927e159aa85720b49795e4f42c623ebddb884a4..c6938be1414c21c93bed441cbaee3e77e75e9e04 100644
--- a/wiki/src/install/inc/overview.es.po
+++ b/wiki/src/install/inc/overview.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-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2018-05-09 18:18+0000\n"
 "Last-Translator: Tails translators <tails-l10n@boum.org>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -30,23 +30,23 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #, fuzzy
 #| msgid ""
 #| "<span class=\"windows linux mac\">2 hours in total</span> <span class="
-#| "\"debian expert\">1½ hour in total</span> <span class=\"install-clone mac-clone\">½ "
-#| "hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+#| "\"debian expert\">1½ hour in total</span> <span class=\"install-clone mac-"
+#| "clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
 "<span class=\"windows linux mac\">2 horas en total</span> <span class="
-"\"debian expert\">1½ hora en total</span> <span class=\"install-clone mac-clone\">½ "
-"hora</span> <span class=\"upgrade-clone\">¼ hora</span>"
+"\"debian expert\">1½ hora en total</span> <span class=\"install-clone mac-"
+"clone\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#| "\"age\"]] to download</small>"
+#| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#| "download</small>"
 msgid ""
 "<span class=\"windows linux mac expert upgrade-tails\"> <small>[[!inline "
 "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to download</"
@@ -64,9 +64,9 @@ msgstr ""
 #| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
 #| "small></span>"
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
 "</span> <span class=\"windows linux mac\"><small>1 hora para instalar</"
 "small></span> <span class=\"debian expert\"><small>½ hora para instalar</"
@@ -74,7 +74,9 @@ msgstr ""
 "small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -82,7 +84,9 @@ msgid "Your Tails"
 msgstr "Tu Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -90,7 +94,9 @@ msgid "1 other Tails"
 msgstr "1 otro Tails"
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+#, fuzzy
+#| msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr "<small>DVD o USB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -148,8 +154,12 @@ msgid "Your steps"
 msgstr "Tus pasos"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+#| "\"ISO image downloaded and verified\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -166,15 +176,19 @@ msgstr "Descargar"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
 "\"imagen ISO descargada y verificada\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
+#| "\" alt=\"Computer restarted on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
 "alt=\"Computadora reiniciada en memoria USB a la derecha\"]]"
@@ -189,8 +203,8 @@ msgstr "Reiniciar"
 #| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 #| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
 "\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
@@ -200,8 +214,12 @@ msgid "Install"
 msgstr "Instalar"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
+#| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
@@ -216,29 +234,37 @@ msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
+#| "installed on USB stick on the right\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails instalado en una memoria USB a la derecha\"]]"
+"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
+"instalado en el USB stick a la derecha\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"install-clone mac-clone\">Install</span> <span class=\"upgrade"
 "\">Upgrade</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Instalar</span> <span "
-"class=\"upgrade\">Actualizar</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Instalar</span> "
+"<span class=\"upgrade\">Actualizar</span>"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
+#| "\"Encryption configured on USB stick on the right\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Cifrado configurado en una memoria USB a la derecha\"]]"
@@ -247,6 +273,13 @@ msgstr ""
 msgid "Configure"
 msgstr "Configurar"
 
+#~ msgid ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails installed on USB stick on the right\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails instalado en una memoria USB a la derecha\"]]"
+
 #~ msgid "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 
@@ -261,22 +294,15 @@ msgstr "Configurar"
 #~ "insertado\"]]"
 
 #~ msgid ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "installed on USB stick on the right\"]]"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "instalado en el USB stick a la derecha\"]]"
-
-#~ msgid ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</"
-#~ "span> <span class=\"debian expert\">1½ hour in total</span> <span class="
-#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</span> "
+#~ "<span class=\"debian expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#~ "hour</span>"
 #~ msgstr ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 horas en total</"
-#~ "span> <span class=\"debian expert\">1½ hora en total</span> <span class="
-#~ "\"install-clone mac-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 horas en total</span> "
+#~ "<span class=\"debian expert\">1½ hora en total</span> <span class="
+#~ "\"install-clone mac-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ "
+#~ "hora</span>"
 
 #~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
@@ -302,25 +328,25 @@ msgstr "Configurar"
 #~ "small></span> <span class=\"upgrade-tails\"><small>¼ hour to upgrade</"
 #~ "small></span>"
 #~ msgstr ""
-#~ "</span> <span class=\"windows linux mac\"><small>1 hora para "
-#~ "instalar</small></span> <span class=\"debian expert\"><small>½ hora para "
-#~ "instalar</small></span> <span class=\"upgrade-tails\"><small>¼ hora para "
+#~ "</span> <span class=\"windows linux mac\"><small>1 hora para instalar</"
+#~ "small></span> <span class=\"debian expert\"><small>½ hora para instalar</"
+#~ "small></span> <span class=\"upgrade-tails\"><small>¼ hora para "
 #~ "actualizar</small></span>"
 
 #~ msgid ""
-#~ "First you will <span class=\"windows linux mac\">install an "
-#~ "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~ "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~ "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
+#~ "First you will <span class=\"windows linux mac\">install an intermediary "
+#~ "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~ "intermediary Tails on a DVD.</span> <span class=\"debian expert\">install "
+#~ "a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
 #~ "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
 #~ "tails\">install an intermediary Tails.</span>"
 #~ msgstr ""
 #~ "Primero vas a <span class=\"windows linux mac\">instalar un Tails "
 #~ "intermediario en la primer memoria USB.</span> <span class=\"\">grabar un "
 #~ "Tails intermediario en un DVD.</span> <span class=\"debian expert"
-#~ "\">instalar Tails en tu memoria USB.</span> <span class=\"install-clone mac-clone "
-#~ "upgrade-clone\">reiniciar en el otro Tails.</span> <span class=\"upgrade-"
-#~ "tails\">instalar un Tails intermediario.</span>"
+#~ "\">instalar Tails en tu memoria USB.</span> <span class=\"install-clone "
+#~ "mac-clone upgrade-clone\">reiniciar en el otro Tails.</span> <span class="
+#~ "\"upgrade-tails\">instalar un Tails intermediario.</span>"
 
 #~ msgid ""
 #~ "<span class=\"windows linux mac upgrade-tails\"><small>[[!toggle id="
@@ -337,19 +363,19 @@ msgstr "Configurar"
 #~ "alt=\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
 
 #~ msgid ""
-#~ "Then you will <span class=\"windows linux mac\">install the final "
-#~ "Tails on the second USB stick.</span> <span class=\"\">install the final "
-#~ "Tails on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
+#~ "Then you will <span class=\"windows linux mac\">install the final Tails "
+#~ "on the second USB stick.</span> <span class=\"\">install the final Tails "
+#~ "on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
 #~ "Tails on your USB stick.</span> <span class=\"debian expert\">configure "
 #~ "it.</span> <span class=\"upgrade-clone upgrade-tails\">upgrade your Tails."
 #~ "</span>"
 #~ msgstr ""
-#~ "Después <span class=\"windows linux mac\">instalarás la versión final "
-#~ "de Tails en la segunda memoria USB.</span> <span class=\"\">instalarás la "
-#~ "versión final de Tails tu memoria USB.</span> <span class=\"install-clone mac-clone"
-#~ "\">instalarás Tails en tu memoria USB.</span> <span class=\"debian expert"
-#~ "\">lo configurarás.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">actualizarás tu Tails.</span>"
+#~ "Después <span class=\"windows linux mac\">instalarás la versión final de "
+#~ "Tails en la segunda memoria USB.</span> <span class=\"\">instalarás la "
+#~ "versión final de Tails tu memoria USB.</span> <span class=\"install-clone "
+#~ "mac-clone\">instalarás Tails en tu memoria USB.</span> <span class="
+#~ "\"debian expert\">lo configurarás.</span> <span class=\"upgrade-clone "
+#~ "upgrade-tails\">actualizarás tu Tails.</span>"
 
 #~ msgid ""
 #~ "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index c07e7e264d62e2647c4ebd88e3f2366253d88981..f5a707b69add38e76bb140b0c43ca2d3803e7b30 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
 
@@ -40,13 +40,13 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -54,7 +54,7 @@ msgid "Your Tails"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -62,7 +62,7 @@ msgid "1 other Tails"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -121,7 +121,7 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 
@@ -132,13 +132,13 @@ msgstr ""
 #. type: Content of: <div><div><div><div>
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -147,8 +147,8 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -157,7 +157,7 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 
@@ -171,8 +171,8 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -184,7 +184,7 @@ msgstr ""
 #. type: Content of: <div><div><div><div>
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index 0d0ce9e82373c92713ecb6a46cdf841cd4abba78..33c602fe26cb0ae9ad77b63b09ca8ea0ddb8d5ac 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2018-03-26 12:52+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -27,24 +27,24 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac\">1½ hours in total</span> <span "
-#| "class=\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#| "<span class=\"windows linux mac\">1½ hours in total</span> <span class="
+#| "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
 #| "hour</span>"
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
 "<span class=\"windows linux mac\">1½ heures au total</span> <span class="
-"\"install-clone mac-clone\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</"
-"span>"
+"\"install-clone mac-clone\">½ heure</span> <span class=\"upgrade-clone\">¼ "
+"d'heure</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#| "\"age\"]] to download</small>"
+#| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#| "download</small>"
 msgid ""
 "<span class=\"windows linux mac expert upgrade-tails\"> <small>[[!inline "
 "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to download</"
@@ -62,9 +62,9 @@ msgstr ""
 #| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
 #| "small></span>"
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
 "</span> <span class=\"windows linux mac\"><small>1 heure pour "
 "l'installation</small></span> <span class=\"debian expert\"><small>½ heure "
@@ -72,7 +72,9 @@ msgstr ""
 "heure pour la mise à jour</small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -80,7 +82,9 @@ msgid "Your Tails"
 msgstr "Votre Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -88,7 +92,9 @@ msgid "1 other Tails"
 msgstr "1 autre Tails"
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+#, fuzzy
+#| msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr "<small>sur un DVD ou une clé USB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -146,8 +152,12 @@ msgid "Your steps"
 msgstr "Votre marche à suivre"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+#| "\"ISO image downloaded and verified\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -164,15 +174,19 @@ msgstr "Téléchargement"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
 "\"Image ISO téléchargée et vérifiée\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
+#| "\" alt=\"Computer restarted on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
 "alt=\"Ordinateur redémarré sur la clé USB de gauche\"]]"
@@ -187,8 +201,8 @@ msgstr "Redémarrage"
 #| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 #| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 "\"Image ISO installée sur la clé USB de gauche\"]]"
@@ -198,8 +212,12 @@ msgid "Install"
 msgstr "Installation"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
+#| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
@@ -214,29 +232,37 @@ msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
+#| "installed on USB stick on the right\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installé sur la clé USB de droite\"]]"
+"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails installé "
+"sur la clé USB de droite\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"install-clone mac-clone\">Install</span> <span class=\"upgrade"
 "\">Upgrade</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Installation</span> "
-"<span class=\"upgrade\">Mise à jour</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Installation</"
+"span> <span class=\"upgrade\">Mise à jour</span>"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
+#| "\"Encryption configured on USB stick on the right\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Chiffrement configuré sur la clé USB de droite\"]]"
@@ -245,6 +271,13 @@ msgstr ""
 msgid "Configure"
 msgstr "Configuration"
 
+#~ msgid ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails installed on USB stick on the right\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails installé sur la clé USB de droite\"]]"
+
 #~ msgid "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 
@@ -258,13 +291,6 @@ msgstr "Configuration"
 #~ "[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inséré"
 #~ "\"]]"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "installed on USB stick on the right\"]]"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "installé sur la clé USB de droite\"]]"
-
 #~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
 
@@ -284,20 +310,19 @@ msgstr "Configuration"
 #~ "sort=\"age\"]] \"\"\"]]"
 
 #~ msgid ""
-#~ "First you will <span class=\"windows linux mac\">install an "
-#~ "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~ "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~ "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
+#~ "First you will <span class=\"windows linux mac\">install an intermediary "
+#~ "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~ "intermediary Tails on a DVD.</span> <span class=\"debian expert\">install "
+#~ "a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
 #~ "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
 #~ "tails\">install an intermediary Tails.</span>"
 #~ msgstr ""
-#~ "Vous allez d'abord <span class=\"windows linux mac\">installer un "
-#~ "Tails intermédiaire sur la première clé USB.</span> <span class="
-#~ "\"\">graver un Tails intermédiaire sur un DVD.</span> <span class="
-#~ "\"debian expert\">installer un Tails sur votre clé USB.</span> <span "
-#~ "class=\"install-clone mac-clone upgrade-clone\">redémarrer sur l'autre Tails.</"
-#~ "span> <span class=\"upgrade-tails\">installer un Tails intermédiaire.</"
-#~ "span>"
+#~ "Vous allez d'abord <span class=\"windows linux mac\">installer un Tails "
+#~ "intermédiaire sur la première clé USB.</span> <span class=\"\">graver un "
+#~ "Tails intermédiaire sur un DVD.</span> <span class=\"debian expert"
+#~ "\">installer un Tails sur votre clé USB.</span> <span class=\"install-"
+#~ "clone mac-clone upgrade-clone\">redémarrer sur l'autre Tails.</span> "
+#~ "<span class=\"upgrade-tails\">installer un Tails intermédiaire.</span>"
 
 #~ msgid ""
 #~ "<span class=\"windows linux mac upgrade-tails\"><small>[[!toggle id="
@@ -314,30 +339,30 @@ msgstr "Configuration"
 #~ "alt=\"Image ISO installée sur la clé USB de gauche\"]]"
 
 #~ msgid ""
-#~ "Then you will <span class=\"windows linux mac\">install the final "
-#~ "Tails on the second USB stick.</span> <span class=\"\">install the final "
-#~ "Tails on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
+#~ "Then you will <span class=\"windows linux mac\">install the final Tails "
+#~ "on the second USB stick.</span> <span class=\"\">install the final Tails "
+#~ "on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
 #~ "Tails on your USB stick.</span> <span class=\"debian expert\">configure "
 #~ "it.</span> <span class=\"upgrade-clone upgrade-tails\">upgrade your Tails."
 #~ "</span>"
 #~ msgstr ""
 #~ "Puis, vous allez <span class=\"windows linux mac\">installer le Tails "
 #~ "final sur la seconde clé USB.</span> <span class=\"\">installer le Tails "
-#~ "final sur une clé USB.</span> <span class=\"install-clone mac-clone\">installer "
-#~ "Tails sur votre clé USB.</span> <span class=\"debian expert\">le "
-#~ "configurer.</span> <span class=\"upgrade-clone upgrade-tails\">mettre à "
-#~ "jour votre Tails.</span>"
+#~ "final sur une clé USB.</span> <span class=\"install-clone mac-clone"
+#~ "\">installer Tails sur votre clé USB.</span> <span class=\"debian expert"
+#~ "\">le configurer.</span> <span class=\"upgrade-clone upgrade-tails"
+#~ "\">mettre à jour votre Tails.</span>"
 
 #~ msgid ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</"
-#~ "span> <span class=\"debian expert\">1½ hour in total</span> <span class="
-#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</span> "
+#~ "<span class=\"debian expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#~ "hour</span>"
 #~ msgstr ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 heures au total</"
-#~ "span> <span class=\"debian expert\">1 heure ½ au total</span> <span class="
-#~ "\"install-clone mac-clone\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 heures au total</span> "
+#~ "<span class=\"debian expert\">1 heure ½ au total</span> <span class="
+#~ "\"install-clone mac-clone\">½ heure</span> <span class=\"upgrade-clone"
+#~ "\">¼ d'heure</span>"
 
 #~ msgid ""
 #~ "</span> <span class=\"windows linux mac\"><small>1 hour to install</"
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index 33eaf0cc22833220e42319974a0ef3cda6c89251..30df24095a23a66b9fe326255c1a9d06ccb85ef4 100644
--- a/wiki/src/install/inc/overview.it.po
+++ b/wiki/src/install/inc/overview.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2016-09-02 14:00+0200\n"
 "Last-Translator: ita team\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -29,15 +29,15 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> "
+"<span class=\"upgrade\">Aggiorna</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 msgid ""
@@ -49,29 +49,33 @@ msgstr ""
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> "
+"<span class=\"upgrade\">Aggiorna</span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "Your Tails"
 msgstr ""
-"<span class=\"windows linux mac\">2 ore</span> <span class=\"debian "
-"expert\">1½ ora</span> <span class=\"install-clone mac-clone\">½ ora</span> <span "
+"<span class=\"windows linux mac\">2 ore</span> <span class=\"debian expert"
+"\">1½ ora</span> <span class=\"install-clone mac-clone\">½ ora</span> <span "
 "class=\"upgrade-clone\">¼ ora</span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -79,7 +83,9 @@ msgid "1 other Tails"
 msgstr "1 altra Tails"
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+#, fuzzy
+#| msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr "<small>DVD o USB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -134,10 +140,15 @@ msgid "Your steps"
 msgstr "La procedura"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
+"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Download"
@@ -150,14 +161,18 @@ msgstr "Scarica"
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
+#| "\" alt=\"Computer restarted on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
 
@@ -171,8 +186,8 @@ msgstr "Riavvia"
 #| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
@@ -186,7 +201,7 @@ msgstr "Installa"
 #| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
@@ -200,29 +215,38 @@ msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#| "alt=\"Tails installed on USB stick on the right\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"install-clone mac-clone\">Install</span> <span class=\"upgrade"
 "\">Upgrade</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Installa</span> "
+"<span class=\"upgrade\">Aggiorna</span>"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#| "alt=\"Tails installed on USB stick on the right\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
+"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Configure"
@@ -239,22 +263,22 @@ msgstr "Configura"
 
 #, fuzzy
 #~| msgid ""
-#~| "First you will <span class=\"windows linux mac\">install an "
-#~| "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~| "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
-#~| "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
-#~| "tails\">install and upgrade an intermediary Tails.</span>"
+#~| "First you will <span class=\"windows linux mac\">install an intermediary "
+#~| "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~| "intermediary Tails on a DVD.</span> <span class=\"debian expert"
+#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone "
+#~| "mac-clone upgrade-clone\">restart on the other Tails.</span> <span class="
+#~| "\"upgrade-tails\">install and upgrade an intermediary Tails.</span>"
 #~ msgid ""
-#~ "First you will <span class=\"windows linux mac\">install an "
-#~ "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~ "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~ "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
+#~ "First you will <span class=\"windows linux mac\">install an intermediary "
+#~ "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~ "intermediary Tails on a DVD.</span> <span class=\"debian expert\">install "
+#~ "a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
 #~ "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
 #~ "tails\">install an intermediary Tails.</span>"
 #~ msgstr ""
-#~ "Per prima cosa dovrai <span class=\"windows linux mac\">installare "
-#~ "una Tails, che farà da intermediazione, sulla prima chiavetta USB.</span> "
+#~ "Per prima cosa dovrai <span class=\"windows linux mac\">installare una "
+#~ "Tails, che farà da intermediazione, sulla prima chiavetta USB.</span> "
 #~ "<span class=\"\">masterizzare una Tails, che farà da intermediazione, su "
 #~ "un DVD.</span> <span class=\"debian expert\">installare una Tails sulla "
 #~ "chiavetta USB.</span> <span class=\"install-clone mac-clone upgrade-clone"
@@ -263,17 +287,17 @@ msgstr "Configura"
 #~ "l'intermediazione.</span>"
 
 #~ msgid ""
-#~ "Then you will <span class=\"windows linux mac\">install the final "
-#~ "Tails on the second USB stick.</span> <span class=\"\">install the final "
-#~ "Tails on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
+#~ "Then you will <span class=\"windows linux mac\">install the final Tails "
+#~ "on the second USB stick.</span> <span class=\"\">install the final Tails "
+#~ "on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
 #~ "Tails on your USB stick.</span> <span class=\"debian expert\">configure "
 #~ "it.</span> <span class=\"upgrade-clone upgrade-tails\">upgrade your Tails."
 #~ "</span>"
 #~ msgstr ""
-#~ "Quindi <span class=\"windows linux mac\">installerai Tails sulla "
-#~ "seconda chiavetta USB.</span> <span class=\"\">installa Tails finalmente "
-#~ "sulla tua chiavetta USB.</span> <span class=\"install-clone mac-clone\">installa "
-#~ "Tails sulla chiavetta USB.</span> <span class=\"debian expert"
+#~ "Quindi <span class=\"windows linux mac\">installerai Tails sulla seconda "
+#~ "chiavetta USB.</span> <span class=\"\">installa Tails finalmente sulla "
+#~ "tua chiavetta USB.</span> <span class=\"install-clone mac-clone"
+#~ "\">installa Tails sulla chiavetta USB.</span> <span class=\"debian expert"
 #~ "\">configurala.</span> <span class=\"upgrade-clone upgrade-tails"
 #~ "\">aggiorna la tua Tails.</span>"
 
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index b4e7fbb9860b826f002aa45042eff23d348dffee..c21405c4f17e598d6a4f205feea626a11433b7e6 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2017-02-09 19:26+0100\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,23 +33,23 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\"]]"
 #, fuzzy
 #| msgid ""
 #| "<span class=\"windows linux mac\">2 hours</span> <span class=\"debian "
-#| "expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</span> <span "
-#| "class=\"upgrade-clone\">¼ hour</span>"
+#| "expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</"
+#| "span> <span class=\"upgrade-clone\">¼ hour</span>"
 msgid ""
-"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in "
-"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"<span class=\"windows linux mac expert upgrade-tails\">1½ hours in total</"
+"span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
 "\"upgrade-clone\">¼ hour</span>"
 msgstr ""
-"<span class=\"windows linux mac\">2 horas</span> <span class=\"debian "
-"expert\">1½ hora</span> <span class=\"install-clone mac-clone\">½ hora</span> <span "
-"class=\"upgrade-clone\">¼ de hora</span>"
+"<span class=\"windows linux mac\">2 horas</span> <span class=\"debian expert"
+"\">1½ hora</span> <span class=\"install-clone mac-clone\">½ hora</span> "
+"<span class=\"upgrade-clone\">¼ de hora</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#| "\"age\"]] to download</small>"
+#| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#| "download</small>"
 msgid ""
 "<span class=\"windows linux mac expert upgrade-tails\"> <small>[[!inline "
 "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to download</"
@@ -67,9 +67,9 @@ msgstr ""
 #| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
 #| "small></span>"
 msgid ""
-"</span> <span class=\"windows linux mac expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-"upgrade</small></span>"
+"</span> <span class=\"windows linux mac expert\"><small>½ hour to install</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+"small></span>"
 msgstr ""
 "</span> <span class=\"windows linux mac\"><small>1 hora para instalar</"
 "small></span> <span class=\"debian expert\"><small>½ hora para instalar</"
@@ -79,7 +79,7 @@ msgstr ""
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -87,7 +87,9 @@ msgid "Your Tails"
 msgstr "Seu Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
 msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -95,7 +97,9 @@ msgid "1 other Tails"
 msgstr "1 outro Tails"
 
 #. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>DVD or USB</small>"
+#, fuzzy
+#| msgid "<small>DVD or USB</small>"
+msgid "<small>USB stick or DVD</small>"
 msgstr "<small>DVD ou USB</small>"
 
 #. type: Content of: <div><div><div><div><div><h4>
@@ -160,7 +164,7 @@ msgstr "Seus passos"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
@@ -173,7 +177,7 @@ msgstr ""
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
@@ -182,8 +186,8 @@ msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 #| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
 #| "\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
 
@@ -195,8 +199,8 @@ msgstr "Reinicie"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -207,7 +211,7 @@ msgstr "Instale"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
@@ -223,38 +227,45 @@ msgstr "[[!img install/inc/icons/restart.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid ""
-#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+#| msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
-msgstr ""
-"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
+msgstr "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac\">Install</span> "
+#| "<span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"install-clone mac-clone\">Install</span> <span class=\"upgrade"
 "\">Upgrade</span>"
 msgstr ""
-"<span class=\"install-clone mac-clone windows linux mac\">Instale</span> <span "
-"class=\"upgrade\">Atualize</span>"
+"<span class=\"install-clone mac-clone windows linux mac\">Instale</span> "
+"<span class=\"upgrade\">Atualize</span>"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Configure"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+#~ msgid ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Tails installed on USB stick on the right\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
+
 #~ msgid "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 #~ msgstr "[[!img install/inc/icons/1-dvd.png link=\"no\" alt=\"\"]]"
 
@@ -268,13 +279,6 @@ msgstr ""
 #~ "inserted\"]]"
 #~ msgstr "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
 
-#, fuzzy
-#~| msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
-#~ msgid ""
-#~ "[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
-#~ "installed on USB stick on the right\"]]"
-#~ msgstr "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
-
 #, fuzzy
 #~| msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
 #~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
@@ -285,17 +289,17 @@ msgstr ""
 
 #, fuzzy
 #~| msgid ""
-#~| "First you will <span class=\"windows linux mac\">install an "
-#~| "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~| "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
-#~| "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
-#~| "tails\">install and upgrade an intermediary Tails.</span>"
+#~| "First you will <span class=\"windows linux mac\">install an intermediary "
+#~| "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~| "intermediary Tails on a DVD.</span> <span class=\"debian expert"
+#~| "\">install a Tails on your USB stick.</span> <span class=\"install-clone "
+#~| "mac-clone upgrade-clone\">restart on the other Tails.</span> <span class="
+#~| "\"upgrade-tails\">install and upgrade an intermediary Tails.</span>"
 #~ msgid ""
-#~ "First you will <span class=\"windows linux mac\">install an "
-#~ "intermediary Tails on the first USB stick.</span> <span class=\"\">burn "
-#~ "an intermediary Tails on a DVD.</span> <span class=\"debian expert"
-#~ "\">install a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
+#~ "First you will <span class=\"windows linux mac\">install an intermediary "
+#~ "Tails on the first USB stick.</span> <span class=\"\">burn an "
+#~ "intermediary Tails on a DVD.</span> <span class=\"debian expert\">install "
+#~ "a Tails on your USB stick.</span> <span class=\"install-clone mac-clone "
 #~ "upgrade-clone\">restart on the other Tails.</span> <span class=\"upgrade-"
 #~ "tails\">install an intermediary Tails.</span>"
 #~ msgstr ""
@@ -308,16 +312,16 @@ msgstr ""
 
 #, fuzzy
 #~| msgid ""
-#~| "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#~| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#~| "\"age\"]] to download</small>"
+#~| "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#~| "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] to "
+#~| "download</small>"
 #~ msgid ""
 #~ "<span class=\"windows linux mac upgrade-tails\"><small>[[!toggle id="
 #~ "\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
 #~ msgstr ""
-#~ "<span class=\"windows linux mac debian expert upgrade-tails\"> "
-#~ "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#~ "\"age\"]] para baixar</small>"
+#~ "<span class=\"windows linux mac debian expert upgrade-tails\"> <small>[[!"
+#~ "inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]] "
+#~ "para baixar</small>"
 
 #, fuzzy
 #~| msgid ""
@@ -330,34 +334,34 @@ msgstr ""
 #~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #~ msgid ""
-#~ "Then you will <span class=\"windows linux mac\">install the final "
-#~ "Tails on the second USB stick.</span> <span class=\"\">install the final "
-#~ "Tails on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
+#~ "Then you will <span class=\"windows linux mac\">install the final Tails "
+#~ "on the second USB stick.</span> <span class=\"\">install the final Tails "
+#~ "on your USB stick.</span> <span class=\"install-clone mac-clone\">install "
 #~ "Tails on your USB stick.</span> <span class=\"debian expert\">configure "
 #~ "it.</span> <span class=\"upgrade-clone upgrade-tails\">upgrade your Tails."
 #~ "</span>"
 #~ msgstr ""
-#~ "Então você irá <span class=\"windows linux mac\">instalar o Tails "
-#~ "final na segunda unidade USB.</span> <span class=\"\">instalar o Tails "
-#~ "final na sua unidade USB.</span> <span class=\"install-clone mac-clone\">instalar o "
-#~ "Tails na unidade USB.</span> <span class=\"debian expert\">configurá-lo.</"
-#~ "span> <span class=\"upgrade-clone upgrade-tails\">atualizar seu Tails.</"
+#~ "Então você irá <span class=\"windows linux mac\">instalar o Tails final "
+#~ "na segunda unidade USB.</span> <span class=\"\">instalar o Tails final na "
+#~ "sua unidade USB.</span> <span class=\"install-clone mac-clone\">instalar "
+#~ "o Tails na unidade USB.</span> <span class=\"debian expert\">configurá-lo."
+#~ "</span> <span class=\"upgrade-clone upgrade-tails\">atualizar seu Tails.</"
 #~ "span>"
 
 #, fuzzy
 #~| msgid ""
-#~| "<span class=\"windows linux mac\">2 hours</span> <span class="
-#~| "\"debian expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</"
+#~| "<span class=\"windows linux mac\">2 hours</span> <span class=\"debian "
+#~| "expert\">1½ hour</span> <span class=\"install-clone mac-clone\">½ hour</"
 #~| "span> <span class=\"upgrade-clone\">¼ hour</span>"
 #~ msgid ""
-#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</"
-#~ "span> <span class=\"debian expert\">1½ hour in total</span> <span class="
-#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#~ "span>"
+#~ "<span class=\"windows linux mac upgrade-tails\">2 hours in total</span> "
+#~ "<span class=\"debian expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#~ "hour</span>"
 #~ msgstr ""
 #~ "<span class=\"windows linux mac\">2 horas</span> <span class=\"debian "
-#~ "expert\">1½ hora</span> <span class=\"install-clone mac-clone\">½ hora</span> <span "
-#~ "class=\"upgrade-clone\">¼ de hora</span>"
+#~ "expert\">1½ hora</span> <span class=\"install-clone mac-clone\">½ hora</"
+#~ "span> <span class=\"upgrade-clone\">¼ de hora</span>"
 
 #, fuzzy
 #~| msgid ""
@@ -371,10 +375,10 @@ msgstr ""
 #~ "small></span> <span class=\"upgrade-tails\"><small>¼ hour to upgrade</"
 #~ "small></span>"
 #~ msgstr ""
-#~ "</span> <span class=\"windows linux mac\"><small>1 hora para "
-#~ "instalar</small></span> <span class=\"debian expert\"><small>½ hora para "
-#~ "instalar</small></span> <span class=\"upgrade-tails\"><small>½ hora para "
-#~ "atualizar</small></span>"
+#~ "</span> <span class=\"windows linux mac\"><small>1 hora para instalar</"
+#~ "small></span> <span class=\"debian expert\"><small>½ hora para instalar</"
+#~ "small></span> <span class=\"upgrade-tails\"><small>½ hora para atualizar</"
+#~ "small></span>"
 
 #, fuzzy
 #~| msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
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 78fecf82b806b382eeb86f56158ee5b30c17adf7..3fa39cd44dae20d640033674db59c8312a6054c0 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2017-02-09 20:59+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -176,19 +176,19 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\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=\"windows linux mac\" 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\" alt=\"Computer restarted on USB stick\"]]\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-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
 
 #. type: Plain text
@@ -197,29 +197,6 @@ msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"n
 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 class=\"note clone\">\n"
-msgstr "<div class=\"note clone\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-"<p>Die folgenden Anweisungen nehmen an, dass sich das Tails, von dem Sie die\n"
-"<span class=\"install-clone mac-clone\">Installation</span>\n"
-"<span class=\"upgrade\">Aktualisierung</span>\n"
-"durchführen, auf einem USB-Stick befindet. Mit einem ähnlichen Vorgehen können Sie auch von einer Tails-DVD aus\n"
-"<span class=\"install-clone mac-clone\">installieren</span>\n"
-"<span class=\"upgrade\">aktualisieren</span>.</p>\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
@@ -253,7 +230,7 @@ msgstr ""
 "   möchten.</p>\n"
 "   <p class=\"upgrade-tails\">Entfernen Sie Ihren USB-Stick, während Sie den USB-Stick mit dem vorübergehenden Tails angeschlossen lassen.</p>\n"
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr "Schalten Sie den Computer ein."
 
@@ -332,19 +309,337 @@ msgstr "   [[!toggleable id=\"not_at_all\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   Tails does not start entirely\n"
+#| "   -----------------------------\n"
+msgid ""
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+"   Tails startet nicht vollständig\n"
+"   -----------------------------\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+"   Der folgende Abschnitt trifft zu, wenn das Menü <span class=\"guilabel\">Boot Tails</span>, aber nicht\n"
+"   der <span class=\"application\">Tails Greeter</span> beim Start von Tails erscheint.\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+
+#. type: Bullet: '         1. '
+#, fuzzy
+#| msgid "Switch on the computer."
+msgid "Shut down the computer."
+msgstr "Schalten Sie den Computer ein."
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
 msgstr ""
-"   Fehlerbehebung\n"
-"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, 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\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</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"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
+msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -419,6 +714,15 @@ msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+"   Fehlerbehebung\n"
+"   ---------------\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -601,38 +905,91 @@ 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"
 
-#~ 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"
+#~ msgid "<div class=\"note clone\">\n"
+#~ msgstr "<div class=\"note clone\">\n"
+
+#~ msgid ""
+#~ "<p>The following instructions assume that the other Tails that you are\n"
+#~ "<span class=\"install-clone mac-clone\">installing</span>\n"
+#~ "<span class=\"upgrade\">upgrading</span>\n"
+#~ "from is on a USB stick. You can also\n"
+#~ "<span class=\"install-clone mac-clone\">install</span>\n"
+#~ "<span class=\"upgrade\">upgrade</span>\n"
+#~ "from a Tails DVD in a similar way.</p>\n"
+#~ msgstr ""
+#~ "<p>Die folgenden Anweisungen nehmen an, dass sich das Tails, von dem Sie die\n"
+#~ "<span class=\"install-clone mac-clone\">Installation</span>\n"
+#~ "<span class=\"upgrade\">Aktualisierung</span>\n"
+#~ "durchführen, auf einem USB-Stick befindet. Mit einem ähnlichen Vorgehen können Sie auch von einer Tails-DVD aus\n"
+#~ "<span class=\"install-clone mac-clone\">installieren</span>\n"
+#~ "<span class=\"upgrade\">aktualisieren</span>.</p>\n"
+
+#~ msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.de\" raw=\"yes\" sort=\"age\"]]\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"
 
-#~ 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"
+#~ 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"
 
 #, 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 ""
+#~| "[[!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"
+#~ "   <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"
+#~ "   <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 ""
+#~| "   [[!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"
+#~ "   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"
+#~ "   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 ""
+#~ "   [[!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 mac-clone\">\n"
@@ -640,20 +997,27 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 #~ "   try these other two methods:</p>\n"
 #~ msgstr ""
 #~ "   <div class=\"bug mac mac-clone\">\n"
-#~ "   <p>Wenn Ihr Computer das vorübergehende Tails nicht startet, können Sie\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\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac 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"
+#~ "     <li class=\"mac\">[[Install from another operating system|install]]</"
+#~ "li>\n"
+#~ "     <li class=\"mac 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\">[[Installation von einem anderen Betriebssystem aus|install]]</li>\n"
-#~ "     <li class=\"mac 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"
+#~ "     <li class=\"mac\">[[Installation von einem anderen Betriebssystem "
+#~ "aus|install]]</li>\n"
+#~ "     <li class=\"mac 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 ""
@@ -661,25 +1025,31 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\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"
+#~ "   <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"
+#~ "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"
+#~ "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"
+#~ "<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"
+#~ "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 e1b1fb6f46bf67bc3754eaef3bcbd91888b97e54..2d4ddcc1606de09246ece369682cf3dee33a87fb 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+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/"
@@ -176,20 +176,21 @@ msgid "<div class=\"step-image\">\n"
 msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\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-source-usb.png link=\"no\" class=\"clone\" alt=\"Memoria USB conectada en la izquierda\"]]\n"
 
 #. type: Plain text
 #, fuzzy, 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\" 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\" alt=\"Computer restarted on USB stick\"]]\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
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
 #. type: Plain text
@@ -197,30 +198,6 @@ msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"n
 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 class=\"note clone\">\n"
-msgstr "<div class=\"note clone\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-"<p>Las siguientes instrucciones asumen que el otro Tails que estás desde el cual\n"
-"<span class=\"install-clone mac-clone\">instalando</span>\n"
-"<span class=\"upgrade\">actualizando</span>\n"
-"se encuentra en una memoria USB. También puedes\n"
-"<span class=\"install-clone mac-clone\">instalar</span>\n"
-"<span class=\"upgrade\">actualizar</span>\n"
-"desde un DVD de Tails de un modo similar.</p>\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
@@ -254,7 +231,7 @@ msgstr ""
 "   Tails.</p>\n"
 "   <p class=\"upgrade-tails\">Desconecta tu memoria USB de Tails mientras dejas la memoria USB intermediaria conectada.</p>\n"
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr "Enciende la computadora."
 
@@ -328,19 +305,336 @@ msgstr "   [[!toggleable id=\"not_at_all\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   Tails does not start entirely\n"
+#| "   -----------------------------\n"
+msgid ""
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+"   Tails no arranca completamente\n"
+"   ------------------------------\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+"   La siguiente sección aplica si el <span class=\"application\">Menú de cargador de arranque</span> aparece, pero no aparece el\n"
+"   <span class=\"application\">Tails Greeter</span> al arracar Tails.\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"EscritorioTails\"]]\n"
+
+#. type: Bullet: '         1. '
+#, fuzzy
+#| msgid "Switch on the computer."
+msgid "Shut down the computer."
+msgstr "Enciende la computadora."
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
 msgstr ""
-"   Resolución de problemas\n"
-"   -----------------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, 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\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</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"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
+msgstr ""
 
 #. type: Plain text
 #, no-wrap
@@ -405,6 +699,15 @@ msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+"   Resolución de problemas\n"
+"   -----------------------\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -570,44 +873,97 @@ 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"
 
-#~ 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 "<div class=\"note clone\">\n"
+#~ msgstr "<div class=\"note clone\">\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 ""
+#~ "<p>The following instructions assume that the other Tails that you are\n"
+#~ "<span class=\"install-clone mac-clone\">installing</span>\n"
+#~ "<span class=\"upgrade\">upgrading</span>\n"
+#~ "from is on a USB stick. You can also\n"
+#~ "<span class=\"install-clone mac-clone\">install</span>\n"
+#~ "<span class=\"upgrade\">upgrade</span>\n"
+#~ "from a Tails DVD in a similar way.</p>\n"
+#~ msgstr ""
+#~ "<p>Las siguientes instrucciones asumen que el otro Tails que estás desde el cual\n"
+#~ "<span class=\"install-clone mac-clone\">instalando</span>\n"
+#~ "<span class=\"upgrade\">actualizando</span>\n"
+#~ "se encuentra en una memoria USB. También puedes\n"
+#~ "<span class=\"install-clone mac-clone\">instalar</span>\n"
+#~ "<span class=\"upgrade\">actualizar</span>\n"
+#~ "desde un DVD de Tails de un modo similar.</p>\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 "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
 
 #~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "   [[!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-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"
+#~ 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 ""
+#~ "   [[!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"
+#~ "   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"
+#~ "   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 ""
+#~ "   [[!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"
+#~ "   <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"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
 #~ "   </div>\n"
 
 #~ msgid ""
@@ -621,13 +977,17 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Escritor
 
 #~ msgid ""
 #~ "   <ul>\n"
-#~ "     <li class=\"mac\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "     <li class=\"mac\">[[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\">[[Instalar desde otro sistema operativo|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</li>\n"
+#~ "     <li class=\"mac\">[[Instalar desde otro sistema operativo|install]]</"
+#~ "li>\n"
+#~ "     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</"
+#~ "li>\n"
 #~ "   </ul>\n"
 
 #~ msgid ""
@@ -635,15 +995,18 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Escritor
 #~ "   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"
+#~ "   <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"
+#~ "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"
+#~ "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"
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 94e255d44d84c49d525e3093ace7d53c7991fe0e..21bd040343d48bc9c35f7cf3ffb15738bcf9cb21 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+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"
@@ -142,17 +142,17 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac\" 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\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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 ""
 
 #. type: Plain text
@@ -160,23 +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 class=\"note clone\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -191,7 +174,7 @@ msgid ""
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr ""
 
@@ -244,13 +227,313 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"bug\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
 msgstr ""
 
 #. type: Plain text
@@ -303,6 +586,13 @@ msgstr ""
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr ""
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
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 2059ee1a44062018a19a7a0499db44d76f172b3d..1b19d7f422862feeb6092f3b8ae65ce7ec4d4ca8 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+0000\n"
 "PO-Revision-Date: 2018-04-20 11:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -173,20 +173,21 @@ msgid "<div class=\"step-image\">\n"
 msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\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-source-usb.png link=\"no\" class=\"clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
 
 #. type: Plain text
 #, fuzzy, 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\" 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\" alt=\"Computer restarted on USB stick\"]]\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
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
 #. type: Plain text
@@ -194,30 +195,6 @@ msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"n
 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 class=\"note clone\">\n"
-msgstr "<div class=\"note clone\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-"<p>Les instructions suivantes supposent que l'autre Tails que vous avez\n"
-"<span class=\"install-clone mac-clone\">installé</span>\n"
-"<span class=\"upgrade\">mis à jour</span>\n"
-"est sur une clé USB. Vous pouvez également\n"
-"<span class=\"install-clone mac-clone\">installer</span>\n"
-"<span class=\"upgrade\">mettre à jour</span>\n"
-"depuis un DVD Tails de façon similaire.</p>\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
@@ -250,7 +227,7 @@ msgstr ""
 "   <span class=\"upgrade\">mettre à niveau</span>.</p>\n"
 "   <p class=\"upgrade-tails\">Déconnecter la clé USB Tails en laissant la clé USB intermédiaire connectée.</p>\n"
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr "Allumer l'ordinateur."
 
@@ -324,19 +301,337 @@ msgstr "   [[!toggleable id=\"not_at_all\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   Tails does not start entirely\n"
+#| "   -----------------------------\n"
+msgid ""
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+"   Tails ne démarre pas complètement\n"
+"   -----------------------------\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+"   La section suivante s'applique si le <span class=\"application\">menu du chargeur d’amorçage</span> apparaît mais pas le\n"
+"   <span class=\"application\">Tails Greeter</span> quand Tails démarre.\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau Tails\"]]\n"
+
+#. type: Bullet: '         1. '
+#, fuzzy
+#| msgid "Switch on the computer."
+msgid "Shut down the computer."
+msgstr "Allumer l'ordinateur."
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
 msgstr ""
-"   Résolution des problèmes\n"
-"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, 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\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</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"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
+msgstr ""
 
 #. type: Plain text
 #, no-wrap
@@ -407,6 +702,15 @@ msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+"   Résolution des problèmes\n"
+"   ---------------\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -572,46 +876,98 @@ 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"
 
-#~ 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 "<div class=\"note clone\">\n"
+#~ msgstr "<div class=\"note clone\">\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 ""
+#~ "<p>The following instructions assume that the other Tails that you are\n"
+#~ "<span class=\"install-clone mac-clone\">installing</span>\n"
+#~ "<span class=\"upgrade\">upgrading</span>\n"
+#~ "from is on a USB stick. You can also\n"
+#~ "<span class=\"install-clone mac-clone\">install</span>\n"
+#~ "<span class=\"upgrade\">upgrade</span>\n"
+#~ "from a Tails DVD in a similar way.</p>\n"
+#~ msgstr ""
+#~ "<p>Les instructions suivantes supposent que l'autre Tails que vous avez\n"
+#~ "<span class=\"install-clone mac-clone\">installé</span>\n"
+#~ "<span class=\"upgrade\">mis à jour</span>\n"
+#~ "est sur une clé USB. Vous pouvez également\n"
+#~ "<span class=\"install-clone mac-clone\">installer</span>\n"
+#~ "<span class=\"upgrade\">mettre à jour</span>\n"
+#~ "depuis un DVD Tails de façon similaire.</p>\n"
+
+#~ msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.fr\" raw=\"yes\" sort=\"age\"]]\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-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 ""
+#~ "[[!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"
+#~ "   <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"
+#~ "   <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 ""
+#~ "   [[!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"
+#~ "   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"
+#~ "   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 ""
+#~ "   [[!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"
+#~ "   <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"
+#~ "   <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"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
 #~ "   </div>\n"
 
 #~ msgid ""
@@ -620,18 +976,23 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau T
 #~ "   try these other two methods:</p>\n"
 #~ msgstr ""
 #~ "   <div class=\"bug mac mac-clone\">\n"
-#~ "   <p>Si votre ordinateur ne démarre pas sur le Tails intermédiaire, vous pouvez\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\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "     <li class=\"mac\">[[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\">[[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"
+#~ "     <li class=\"mac\">[[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 ""
@@ -639,22 +1000,27 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau T
 #~ "   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"
+#~ "   <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"
+#~ "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"
+#~ "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"
+#~ "<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 9b4177115a9b67944acdf3c5a416ca6209f164a0..54062c103a7673ec6bc49d2620285934a70eb6e5 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+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"
@@ -176,19 +176,19 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\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-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac\" 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\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
 
 #. type: Plain text
@@ -196,30 +196,6 @@ msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"n
 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 class=\"note clone\">\n"
-msgstr "<div class=\"note clone\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-"<p>Le istruzioni seguenti assumono che l'altra Tails da cui stai\n"
-"<span class=\"install-clone mac-clone\">installando</span>\n"
-"<span class=\"upgrade\">aggiornando</span>\n"
-"sia su una chiave USB. Puoi anche\n"
-"<span class=\"install-clone mac-clone\">installare</span>\n"
-"<span class=\"upgrade\">aggiornare</span>\n"
-"da un DVD Tails in modo simile.</p>\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
@@ -253,7 +229,7 @@ msgstr ""
 "   </p>\n"
 "   <p class=\"upgrade-tails\">Scollega la tua chiave USB Tails lasciando la chiave USB intermediaria collegata.</p>\n"
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr "Riaccendi il computer."
 
@@ -332,19 +308,337 @@ msgstr "   [[!toggleable id=\"not_at_all\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   Tails does not start entirely\n"
+#| "   -----------------------------\n"
+msgid ""
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+"   Tails non si avvia\n"
+"   -----------------------------\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+"   La seguente sessione si applica a quando il menù <span class=\"guilabel\">Avvia Tails</span> compare, ma non il\n"
+"   <span class=\"application\">Tails Greeter</span> quando si avvia Tails.\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+
+#. type: Bullet: '         1. '
+#, fuzzy
+#| msgid "Switch on the computer."
+msgid "Shut down the computer."
+msgstr "Riaccendi il computer."
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
 msgstr ""
-"   Risoluzione dei problemi\n"
-"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, 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\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</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"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
+msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -419,6 +713,15 @@ msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+"   Risoluzione dei problemi\n"
+"   ---------------\n"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -595,23 +898,56 @@ 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 ""
 
+#~ msgid "<div class=\"note clone\">\n"
+#~ msgstr "<div class=\"note clone\">\n"
+
 #~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
+#~ "<p>The following instructions assume that the other Tails that you are\n"
+#~ "<span class=\"install-clone mac-clone\">installing</span>\n"
+#~ "<span class=\"upgrade\">upgrading</span>\n"
+#~ "from is on a USB stick. You can also\n"
+#~ "<span class=\"install-clone mac-clone\">install</span>\n"
+#~ "<span class=\"upgrade\">upgrade</span>\n"
+#~ "from a Tails DVD in a similar way.</p>\n"
+#~ msgstr ""
+#~ "<p>Le istruzioni seguenti assumono che l'altra Tails da cui stai\n"
+#~ "<span class=\"install-clone mac-clone\">installando</span>\n"
+#~ "<span class=\"upgrade\">aggiornando</span>\n"
+#~ "sia su una chiave USB. Puoi anche\n"
+#~ "<span class=\"install-clone mac-clone\">installare</span>\n"
+#~ "<span class=\"upgrade\">aggiornare</span>\n"
+#~ "da un DVD Tails in modo simile.</p>\n"
+
+#~ msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.it\" raw=\"yes\" sort=\"age\"]]\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"
+#~ "   <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"
 
 #~ msgid ""
 #~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
-#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\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"
+#~ "   potrebbe essere etichettato <span class=\"guilabel\">Windows</span> "
+#~ "come nello screenshot seguente:</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 ""
+#~ "   [[!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 mac-clone\">\n"
@@ -624,13 +960,17 @@ msgstr ""
 
 #~ msgid ""
 #~ "   <ul>\n"
-#~ "     <li class=\"mac\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
+#~ "     <li class=\"mac\">[[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\">[[Installa da un altro sistema operativo|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Installa dalla riga di comando|mac/usb]]</li>\n"
+#~ "     <li class=\"mac\">[[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 ""
@@ -644,10 +984,12 @@ msgstr ""
 
 #~ 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"
+#~ "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"
+#~ "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"
@@ -776,6 +1118,3 @@ msgstr ""
 #~ 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"
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 7768299864d0b6ea3e24c08d48bffbf3c1ce6104..920c71f2c65ac7a57472eaeb2ebf2a569af96fc9 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-11-17 10:57+0000\n"
+"POT-Creation-Date: 2018-11-17 12:21+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"
@@ -144,18 +144,19 @@ msgid "<div class=\"step-image\">\n"
 msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac\" 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\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone\" 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 ""
 
 #. type: Plain text
@@ -163,23 +164,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 class=\"note clone\">\n"
-msgstr "<div class=\"note clone\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone mac-clone\">installing</span>\n"
-"<span class=\"upgrade\">upgrading</span>\n"
-"from is on a USB stick. You can also\n"
-"<span class=\"install-clone mac-clone\">install</span>\n"
-"<span class=\"upgrade\">upgrade</span>\n"
-"from a Tails DVD in a similar way.</p>\n"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -194,7 +178,7 @@ msgid ""
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr ""
 
@@ -247,13 +231,314 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span>\n"
+"   does not appear when starting on a USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "   ### Getting to the boot menu\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   On most computers, you can press a *boot menu key* to display a list of\n"
+"   possible devices to start from. The following instructions explain how\n"
+"   to display the boot menu and start on the USB stick. The following\n"
+"   screenshot is an example of such boot menu:\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
+msgstr "<div class=\"step-image\">[[!img install/inc/infography/switch-context.png link=\"no\" alt=\"\"]]</div>\n"
+
+#. type: Bullet: '         1. '
+msgid "Shut down the computer."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Make sure that the first USB stick is plugged in the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      <table>\n"
+"        <tr><th>Manufacturer</th><th>Key</th></tr>\n"
+"        <tr><td>Acer</td><td>Esc, F12, F9</td></tr>\n"
+"        <tr><td>Asus</td><td>Esc, F8</td></tr>\n"
+"        <tr><td>Dell</td><td>F12</td></tr>\n"
+"        <tr><td>Fujitsu</td><td>F12, Esc</td></tr>\n"
+"        <tr><td>HP</td><td>Esc, F9</td></tr>\n"
+"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
+"        <tr><td>Samsung</td><td>Esc, F12, F2</td></tr>\n"
+"        <tr><td>Sony</td><td>F11, Esc, F10</td></tr>\n"
+"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
+"        <tr><td>others&hellip;</td><td>F12, Esc</td></tr>\n"
+"      </table>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      a. If a boot menu with a list of devices appears, select your USB stick\n"
+"         and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      a. If the computer starts on another operating system, then:\n"
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
+msgstr ""
+
+#. type: Bullet: '         1. '
+msgid ""
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If a boot menu with a list of devices appears, select your USB stick\n"
+"               and press <span class=\"keycap\">Enter</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"            a. If the computer starts on another operating system or returns an\n"
+"               error message, then shut down the computer again and repeat step\n"
+"               4 for all the potential boot menu keys identified in step 3.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   If none of the potential boot menu keys identified in step 3 work or if\n"
+"   the USB stick does not appear in the list, then try the second\n"
+"   troubleshooting technique described below.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"tip\">\n"
+"   <p>Search for the user manual of the computer on the website of its\n"
+"   manufacturer to learn how to edit the BIOS settings:\n"
+"   <ul>\n"
+"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
+"     <li>[Asus](https://www.asus.com/us/support/)</li>\n"
+"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
+"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
+"     <li>[HP](https://support.hp.com/us-en/products/)</li>\n"
+"     <li>[Lenovo](http://support.lenovo.com/us/en/)</li>\n"
+"     <li>[Samsung](http://www.samsung.com/us/support/downloads)</li>\n"
+"     <li>[Sony](http://esupport.sony.com/US)</li>\n"
+"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
+"   </ul>\n"
+"   </p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   In the BIOS settings, try to apply the following changes one by one and\n"
+"   restart the computer after each change. Some changes might not\n"
+"   apply to certain computer models.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Take note of the changes that you apply to the BIOS settings, to be\n"
+"   able to revert them if they prevent the computer to start on its usual\n"
+"   operating system.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. Edit the **Boot Order**. Depending on the computer model you might\n"
+"   see an entry for **removable devices** or **USB media**. Move this entry\n"
+"   to the top of the list to force the computer to try to start from\n"
+"   the first USB stick before starting from the internal hard disk.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the computer is configured to start with **legacy BIOS**, try to\n"
+"   configure it to start with **UEFI**. Else, if the computer is configured\n"
+"   to start with **UEFI**, try to configure it to start with **legacy\n"
+"   BIOS**. To do so, try any of the following options if available:\n"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"bug\">\n"
+"   <p>If none of these options work, we are sorry but you might not be\n"
+"   able to use Tails on this computer.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Are you trying to start Tails on a USB stick or a DVD?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr ""
+
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      Note that these are the only supported installation methods.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Have you been able to start Tails successfully on this computer before, from "
+"another USB stick or DVD, or with another version of Tails? If so, which "
+"ones?"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
 msgstr ""
 
 #. type: Plain text
@@ -306,6 +591,13 @@ msgstr ""
 msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
 msgstr ""
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   Troubleshooting\n"
+"   ---------------\n"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -430,3 +722,6 @@ 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 ""
+
+#~ msgid "<div class=\"note clone\">\n"
+#~ msgstr "<div class=\"note clone\">\n"