diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index a65eded20bac58e69d3a4d04a87f3f0a5aa0c057..dd66419e680b33bc983049073e07f3cdf36dee29 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
 "PO-Revision-Date: 2018-04-04 20:23+0200\n"
 "Last-Translator: Tails translators\n"
 "Language-Team: \n"
@@ -28,17 +28,17 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #, 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 class=\"upgrade-clone\">¼ hour</span>"
+#| "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=\"upgrade-clone\">¼ hour</span>"
+"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
@@ -72,16 +72,16 @@ msgstr ""
 "Stunde zum Aktualisieren</small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/1-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 "Ihr Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
@@ -149,7 +149,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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO-"
@@ -164,19 +164,20 @@ 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=\"USB image downloaded and verified\"]]"
+"alt=\"ISO image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid ""
-#| "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\"]]"
+#| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
+#| "\"]]"
 msgid ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computer neugestartet und USB-Stick zur linken Seite\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Computer neugestartet und USB-Stick zur linken Seite\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -186,8 +187,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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -198,7 +199,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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO-"
@@ -216,32 +217,33 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
+#| msgid ""
+#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
+"[[!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-tails.png link=\"no\" alt=\"Tails auf "
-"dem USB-Stick zur rechten Seite installiert\"]]"
+"[[!img install/inc/infography/clone-intermediary-tails.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\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Verschlüsselung auf dem USB-Stick zur rechten Seite eingerichtet\"]]"
@@ -277,17 +279,17 @@ msgstr "Konfigurieren"
 #, 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>"
+#~| "\"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>"
+#~ "\"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"
-#~ "\">½ Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>"
+#~ "\"debian expert\">1½  Stunden</span> <span class=\"install-clone mac-clone\">½ "
+#~ "Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>"
 
 #, fuzzy
 #~| msgid ""
@@ -319,23 +321,23 @@ msgstr "Konfigurieren"
 #~| "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>"
+#~| "\">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 upgrade-clone\">restart on the other Tails.</span> <span class="
-#~ "\"upgrade-tails\">install an intermediary Tails.</span>"
+#~ "\">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 ""
 #~ "Als erstes werden Sie <span class=\"windows linux mac\">ein "
 #~ "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
@@ -364,18 +366,17 @@ msgstr "Konfigurieren"
 #~ 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 Tails on your USB stick.</span> <span class=\"debian expert"
-#~ "\">configure it.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">upgrade your Tails.</span>"
+#~ "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.</span> <span class=\"debian expert\">es konfigurieren.</"
-#~ "span> <span class=\"upgrade-clone upgrade-tails\">Ihr Tails aktualisieren."
-#~ "</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>"
 
 #, fuzzy
 #~| msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
diff --git a/wiki/src/install/inc/overview.es.po b/wiki/src/install/inc/overview.es.po
index 694759b18051da21f484ad9ad93ed0edad280d41..c927e159aa85720b49795e4f42c623ebddb884a4 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+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,16 +30,16 @@ 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=\"upgrade-clone\">¼ hour</span>"
+"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
@@ -74,16 +74,16 @@ msgstr ""
 "small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/1-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 "Tu Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
@@ -148,12 +148,8 @@ 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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -170,18 +166,18 @@ msgstr "Descargar"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"USB image downloaded and verified\"]]"
+"alt=\"ISO 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>
 msgid ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computadora reiniciada en memoria USB a la derecha\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Computadora reiniciada en memoria USB a la derecha\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -193,8 +189,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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
 "\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
@@ -204,12 +200,8 @@ 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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
@@ -225,32 +217,28 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
+"[[!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-tails.png link=\"no\" alt=\"Tails "
-"instalado en una memoria USB a la derecha\"]]"
+"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
+"\"Tails instalado en una memoria USB 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\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Cifrado configurado en una memoria USB a la derecha\"]]"
@@ -282,13 +270,13 @@ msgstr "Configurar"
 #~ 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>"
+#~ "\"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>"
+#~ "\"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=\"\"]]"
@@ -323,16 +311,16 @@ msgstr "Configurar"
 #~ "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>"
+#~ "\">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="
@@ -351,17 +339,17 @@ msgstr "Configurar"
 #~ 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 Tails on your USB stick.</span> <span class=\"debian expert"
-#~ "\">configure it.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">upgrade your Tails.</span>"
+#~ "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>"
+#~ "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 933edb20003b6acaa1c6032b67a2c7303d6936d5..c07e7e264d62e2647c4ebd88e3f2366253d88981 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+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"
@@ -27,8 +27,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=\"upgrade-clone\">¼ hour</span>"
+"total</span> <span class=\"install-clone mac-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h4><span>
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/1-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/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "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=\"USB image downloaded and verified\"]]"
+"alt=\"ISO image downloaded and verified\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "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-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-intermediary-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\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
 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 4d8566e55b97692deb5e734f6217365ca75eb0f6..0d0ce9e82373c92713ecb6a46cdf841cd4abba78 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
 "PO-Revision-Date: 2018-03-26 12:52+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -28,16 +28,16 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
 #, fuzzy
 #| msgid ""
 #| "<span class=\"windows linux mac\">1½ hours in total</span> <span "
-#| "class=\"install-clone mac-clone\">½ hour</span> <span class=\"upgrade-"
-#| "clone\">¼ hour</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=\"upgrade-clone\">¼ hour</span>"
+"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
@@ -72,16 +72,16 @@ msgstr ""
 "heure pour la mise à jour</small></span>"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/1-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 "Votre Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
@@ -146,12 +146,8 @@ 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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -168,18 +164,18 @@ msgstr "Téléchargement"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"USB image downloaded and verified\"]]"
+"alt=\"ISO 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>
 msgid ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
-"\"Ordinateur redémarré sur la clé USB de gauche\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
+"alt=\"Ordinateur redémarré sur la clé USB de gauche\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -191,8 +187,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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 "\"Image ISO installée sur la clé USB de gauche\"]]"
@@ -202,12 +198,8 @@ 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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
@@ -223,32 +215,28 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
+"[[!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-tails.png link=\"no\" alt=\"Tails "
-"installé sur la clé USB de droite\"]]"
+"[[!img install/inc/infography/clone-intermediary-tails.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\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Chiffrement configuré sur la clé USB de droite\"]]"
@@ -299,17 +287,17 @@ msgstr "Configuration"
 #~ "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>"
+#~ "\">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>"
+#~ "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="
@@ -328,28 +316,28 @@ msgstr "Configuration"
 #~ 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 Tails on your USB stick.</span> <span class=\"debian expert"
-#~ "\">configure it.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">upgrade your Tails.</span>"
+#~ "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>"
+#~ "\"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>"
+#~ "\"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 315c1c1a858f9d3018567365a859bcd276e56250..33eaf0cc22833220e42319974a0ef3cda6c89251 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+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=\"upgrade-clone\">¼ hour</span>"
+"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,30 +49,30 @@ 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>"
 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/usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
+msgid "[[!img install/inc/icons/1-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 class=\"upgrade-clone\">¼ ora</span>"
+"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/usb.png link=\"no\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
@@ -134,15 +134,10 @@ 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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "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"
@@ -155,15 +150,16 @@ 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=\"USB image downloaded and verified\"]]"
+"alt=\"ISO image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!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-other-tails.png link=\"no\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-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\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -175,8 +171,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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
@@ -190,7 +186,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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
@@ -205,31 +201,28 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
-msgstr "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
+"[[!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\"]]"
 
 #. 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/restart-on-other-tails.png link=\"no\" alt="
-#| "\"Computer restarted on USB stick on the left\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick\"]]"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
+msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Configure"
@@ -249,16 +242,16 @@ msgstr "Configura"
 #~| "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>"
+#~| "\">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 upgrade-clone\">restart on the other Tails.</span> <span class="
-#~ "\"upgrade-tails\">install an intermediary Tails.</span>"
+#~ "\">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> "
@@ -272,15 +265,15 @@ msgstr "Configura"
 #~ 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 Tails on your USB stick.</span> <span class=\"debian expert"
-#~ "\">configure it.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">upgrade your Tails.</span>"
+#~ "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"
+#~ "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 6a9804c047035e5992704d847a7a562b88b9a42c..b4e7fbb9860b826f002aa45042eff23d348dffee 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-11 18:38+0000\n"
+"POT-Creation-Date: 2018-11-07 15:43+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,16 +33,16 @@ 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=\"upgrade-clone\">¼ hour</span>"
+"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>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 #, fuzzy
@@ -78,17 +78,17 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
-msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+#| msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "Your Tails"
 msgstr "Seu Tails"
 
 #. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/usb.png link=\"no\"]]"
-msgstr "[[!img install/inc/icons/usb.png link=\"no\"]]"
+msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
+msgstr "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><div><h4>
 msgid "1 other Tails"
@@ -160,7 +160,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=\"USB "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
 "image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
@@ -173,17 +173,19 @@ 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=\"USB image downloaded and verified\"]]"
+"alt=\"ISO image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid ""
-#| "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\"]]"
+#| "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
+#| "\"]]"
 msgid ""
-"[[!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-other-tails.png link=\"no\"]]"
+"[[!img install/inc/infography/restart-on-intermediary-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\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -193,8 +195,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=\"USB image "
-"installed on USB stick\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -205,7 +207,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=\"USB "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
 "image installed on USB stick on the left\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
@@ -221,30 +223,32 @@ msgstr "[[!img install/inc/icons/restart.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
+#| msgid ""
+#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
-"installed on USB stick on the right\"]]"
-msgstr "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
+"[[!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\"]]"
 
 #. 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\"]]"
+"\"Encryption configured on USB stick on the right\"]]"
 msgstr "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -284,16 +288,16 @@ msgstr ""
 #~| "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>"
+#~| "\">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 upgrade-clone\">restart on the other Tails.</span> <span class="
-#~ "\"upgrade-tails\">install an intermediary Tails.</span>"
+#~ "\">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 ""
 #~ "Primeiro você vai <span class=\"windows linux mac\">instalar um Tails "
 #~ "intermediário na primeira memória USB.</span> <span class=\"\">gravar um "
@@ -328,32 +332,32 @@ msgstr ""
 #~ 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 Tails on your USB stick.</span> <span class=\"debian expert"
-#~ "\">configure it.</span> <span class=\"upgrade-clone upgrade-tails"
-#~ "\">upgrade your Tails.</span>"
+#~ "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.</span>"
+#~ "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> <span class=\"upgrade-clone\">¼ hour</span>"
+#~| "\"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>"
+#~ "\"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 ""
diff --git a/wiki/src/install/inc/steps/clone.inline.de.po b/wiki/src/install/inc/steps/clone.inline.de.po
index a5ccdab467cdc64bf89a703eb4dc97fec62661de..f0de1d1af477dbdeb62263a551d17a5f7de1c513 100644
--- a/wiki/src/install/inc/steps/clone.inline.de.po
+++ b/wiki/src/install/inc/steps/clone.inline.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-11 15:52+0000\n"
+"POT-Creation-Date: 2018-11-11 13:15+0000\n"
 "PO-Revision-Date: 2016-03-05 03:13-0000\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -65,9 +65,15 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"clone\" alt=\"Second USB stick plugged on the right\"]]\n"
 msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac install-clone mac-clone\"]]\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "</div>\n"
@@ -130,14 +136,14 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
+#| msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "   [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"expert\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
 msgstr "   [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"expert\"]]\n"
 
 #. type: Plain text
@@ -147,9 +153,9 @@ msgstr "   <div class=\"step-image\">\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
-msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
+#| msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
+msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -285,11 +291,6 @@ msgstr "<p>Sie sind fertig mit der Aktualisierung von Tails. Sie können nun her
 msgid "<p>Thank you for staying safe!</p>\n"
 msgstr "<p>Vielen Dank, dass Sie sicher bleiben!</p>\n"
 
-#, fuzzy
-#~| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-#~ msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-#~ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-
 #~ msgid "<div class=\"note upgrade\">\n"
 #~ msgstr "<div class=\"note upgrade\">\n"
 
diff --git a/wiki/src/install/inc/steps/clone.inline.es.po b/wiki/src/install/inc/steps/clone.inline.es.po
index d0228477aae607f54511eae82573046133eb4f63..bd1b28d005e2ab3dd1d395e698e10d311d7e3bab 100644
--- a/wiki/src/install/inc/steps/clone.inline.es.po
+++ b/wiki/src/install/inc/steps/clone.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-11 15:52+0000\n"
+"POT-Creation-Date: 2018-11-11 13:15+0000\n"
 "PO-Revision-Date: 2018-08-10 20:39+0000\n"
 "Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -66,9 +66,14 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac clone\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"clone\" alt=\"Second USB stick plugged on the right\"]]\n"
 msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac clone\" alt=\"Segunda memoria USB conectada a la derecha\"]]\n"
 
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Segunda memoria USB conectada a la derecha\"]]\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "</div>\n"
@@ -130,14 +135,14 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clonar el Tails actual'\"]]\n"
+#| msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clonar el Tails actual'\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clonar el actual Tails'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clonar el actual Tails'\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -146,9 +151,9 @@ msgstr "   <div class=\"step-image\">\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails instalado en una memoria USB a la derecha\"]]\n"
+#| msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails instalado en una memoria USB a la derecha\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -280,9 +285,6 @@ msgstr "<p>Terminaste de actualizar Tails. Ya puedes apagar y reiniciar en tu me
 msgid "<p>Thank you for staying safe!</p>\n"
 msgstr "<p>¡Gracias por mantenerte seguro!</p>\n"
 
-#~ msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-#~ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Segunda memoria USB conectada a la derecha\"]]\n"
-
 #~ msgid "<div class=\"note upgrade\">\n"
 #~ msgstr "<div class=\"note upgrade\">\n"
 
diff --git a/wiki/src/install/inc/steps/clone.inline.fr.po b/wiki/src/install/inc/steps/clone.inline.fr.po
index 75efb4ab32f470db618295c739aad9f2874d8ec0..5d38a3648ae813c5027f7cc81b63d3ceaebebea1 100644
--- a/wiki/src/install/inc/steps/clone.inline.fr.po
+++ b/wiki/src/install/inc/steps/clone.inline.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-11 15:52+0000\n"
+"POT-Creation-Date: 2018-11-11 13:15+0000\n"
 "PO-Revision-Date: 2018-08-07 13:17+0000\n"
 "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -65,9 +65,14 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac clone\" alt=\"Second USB stick plugged on the right\"]]\n"
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"clone\" alt=\"Second USB stick plugged on the right\"]]\n"
 msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
 
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "</div>\n"
@@ -130,14 +135,14 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
+#| msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac install-clone\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Installeur de Tails : 'Cloner le Tails actuellement utilisé'\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -146,9 +151,9 @@ msgstr "   <div class=\"step-image\">\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
+#| msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -280,9 +285,6 @@ msgstr "<p>Vous avez fini la mise à jour de Tails. Vous pouvez maintenant étei
 msgid "<p>Thank you for staying safe!</p>\n"
 msgstr "<p>Merci de prendre soin de vous !</p>\n"
 
-#~ msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-#~ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
-
 #~ msgid "<div class=\"note upgrade\">\n"
 #~ msgstr "<div class=\"note upgrade\">\n"
 
diff --git a/wiki/src/install/inc/steps/clone.inline.pt.po b/wiki/src/install/inc/steps/clone.inline.pt.po
index fac488aefd50bed485a77d0e13d9a51d7affb4ac..aac8439762f6956c1045916c921c6f32fcf41f3e 100644
--- a/wiki/src/install/inc/steps/clone.inline.pt.po
+++ b/wiki/src/install/inc/steps/clone.inline.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-11-11 15:52+0000\n"
+"POT-Creation-Date: 2018-11-11 13:15+0000\n"
 "PO-Revision-Date: 2016-04-30 12:36-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -66,9 +66,15 @@ msgstr "<div class=\"step-image\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"clone\" alt=\"Second USB stick plugged on the right\"]]\n"
 msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac install-clone mac-clone\"]]\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "</div>\n"
@@ -131,14 +137,14 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
-msgstr "   [[!img install/inc/screenshots/tails_installer.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
+#| msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr "   [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"windows linux mac upgrade install-clone\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "   [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"expert\"]]\n"
-msgid "   [[!img install/inc/screenshots/tails_installer_upgrade.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgid "   [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
 msgstr "   [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"expert\"]]\n"
 
 #. type: Plain text
@@ -148,9 +154,9 @@ msgstr "   <div class=\"step-image\">\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
-msgid "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
-msgstr "   [[!img install/inc/infography/clone-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
+#| msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
+msgid "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr "   [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac clone upgrade-tails\"]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -246,11 +252,6 @@ msgstr ""
 msgid "<p>Thank you for staying safe!</p>\n"
 msgstr ""
 
-#, fuzzy
-#~| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-#~ msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
-#~ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-
 #~ msgid "<div class=\"note upgrade\">\n"
 #~ msgstr "<div class=\"note upgrade\">\n"
 
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 b07839151f59ff23cf90b6037ccba21c560a59c9..78fecf82b806b382eeb86f56158ee5b30c17adf7 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+0000\n"
 "PO-Revision-Date: 2017-02-09 20:59+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -176,20 +176,20 @@ 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-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.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-other-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\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
+#| 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"
+msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
+#| 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"
+msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -197,6 +197,29 @@ msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" cla
 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 ""
@@ -205,7 +228,7 @@ msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" cla
 #| "   </p>\n"
 #| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 #| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"install-clone mac-clone\">install</span>\n"
 #| "   <span class=\"upgrade\">upgrade</span>\n"
 #| "   from.</p>\n"
 #| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -230,7 +253,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."
 
@@ -309,417 +332,19 @@ 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 at all\n"
-#| "   ---------------------------\n"
-msgid ""
-"   Troubleshooting: Tails does not start at all\n"
-"   --------------------------------------------\n"
-msgstr ""
-"   Tails startet gar nicht\n"
-"   ---------------------- \n"
-
-#. 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 ""
-"   Der folgende Abschnitt trifft zu, wenn von einem USB-Stick gestartet wird und das\n"
-"   <span class=\"guilabel\">Boot-Menü</span> nicht erscheint.\n"
-
-#. 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 ""
-"   Es ist durchaus gewöhnlich, dass Computer nicht automatisch von einem USB-Stick\n"
-"   mit installiertem Tails starten. Hier sind einige Vorgehensweisen zur Problemlösung. Sie sollten diese\n"
-"   eine nach der anderen ausprobieren.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ### In das Boot-Menü gelangen\n"
-
-#. 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 ""
-"   Auf den meisten Computer können Sie eine *Boot-Menü-Taste* drücken, um eine Liste der\n"
-"   möglichen Geräte anzuzeigen, von denen gestartet werden kann. Die folgenden Anweisungen erklären,\n"
-"   wie Sie das Boot-Menü anzeigen können und von daraus den USB-Stick starten können. Das folgende\n"
-"   Bildschirmfoto ist ein Beispiel eines solchen Boot-Menüs:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-
-#. type: Bullet: '         1. '
-msgid "Shut down the computer."
-msgstr "Fahren Sie den Computer herunter."
-
-#. type: Bullet: '   1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
-msgstr ""
-"Stellen Sie sicher, dass der USB-Stick an dem Computer angeschlossen ist."
-
-#. 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 ""
-"   1. Ermitteln Sie, abhängig vom Computerhersteller, in der folgenden Liste\n"
-"   die möglichen Tasten für das Boot-Menü des Computers:\n"
-
-#. 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 ""
-"      <table>\n"
-"        <tr><th>Hersteller</th><th>Taste</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>andere&hellip;</td><td>F12, Esc</td></tr>\n"
-"      </table>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
-msgstr "      Drücken Sie sofort mehrmals die erste der möglichen Tasten für das Boot-Menü, die Sie in Schritt 3 ermittelten.\n"
-
 #. 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 ""
-"      a. Wenn ein Boot-Menü mit einer Liste von Geräten erscheint, wählen Sie Ihren\n"
-"         USB-Stick aus und drücken Sie <span class=\"keycap\">Enter</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      a. If the computer starts on another operating system, then:\n"
-msgstr "      a. Wenn der Computer ein anderes Betriebssystem startet:\n"
-
-#. type: Bullet: '         1. '
-msgid "Press-and-hold the potential boot menu key identified in step 3."
-msgstr ""
-"Drücken und halten Sie die von Ihnen in Schritt 3 ermittelte mögliche Taste "
-"für das Boot-Menü."
-
-#. type: Bullet: '         1. '
-msgid ""
-"Switch on the computer again while holding the potential boot menu key "
-"pressed."
-msgstr ""
-"Schalten Sie den Computer wieder ein, währenddessen Sie die mögliche Taste "
-"für das Boot-Menü gedrückt halten."
-
-#. 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 ""
-"            a. Wählen Sie Ihren USB-Stick aus, wenn ein Boot-Menü erscheint\n"
-"               und drücken Sie <span class=\"keycap\">Enter</span>.\n"
-
-#. 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 ""
-"            a. Fahren Sie den Computer erneut herunter und wiederholen Sie\n"
-"               Schritt 4 mit allen möglichen Tasten für das Boot-Menü, die Sie in Schritt 3 ermittelt haben,\n"
-"               wenn der Computer ein anderes Betriebssystem startet oder eine Fehlermeldung\n"
-"               anzeigt.\n"
-
-#. 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 ""
-"   Versuchen Sie die weiter unter beschriebene, zweite\n"
-"   Vorgehensweise zur Problemlösung, wenn keine der\n"
-"   möglichen Tasten für das Boot-Menü, die Sie in Schritt 3 ermittelt haben,\n"
-"   funktionieren sollte, oder der USB-Stick nicht in der Liste erscheint.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Überprüfen Sie unsere Liste der bekannten Probleme\n"
-
-#. 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 ""
-"   Vergleichbare Probleme könnten möglicherweise bereits für Ihr Computermodell\n"
-"   in unserer [[Liste der bekannten Probleme|support/known_issues]] berichtet worden sein.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Edit the BIOS settings\n"
-msgstr "   ### Bearbeiten Sie die BIOS-Einstellungen\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   You might need to edit the BIOS settings of the computer.\n"
-msgstr "   Sie müssen möglicherweise die BIOS-Einstellungen des Computers bearbeiten.\n"
-
-#. 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 ""
-"   <div class=\"tip\">\n"
-"   <p>Suchen Sie nach der Bedienungssanleitung des Computers auf der Webseite des\n"
-"   Herstellers, um zu erfahren, wie Sie die BIOS-Einstellungen bearbeiten:\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"
-
-#. 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 ""
-"   Versuchen Sie in den BIOS-Einstellungen die folgenden Änderungen eine nach der anderen\n"
-"   anzuwenden und den Computer nach jeder Änderung neuzustarten. Manche Änderungen könnten\n"
-"   möglicherweise auf manche Computermodelle nicht zutreffen.\n"
-
-#. 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 ""
-"   <div class=\"caution\">\n"
-"   <p>Notieren Sie sich die Änderungen, die Sie an den Einstellungen des BIOS durchführen,\n"
-"   um in der Lage zu sein, diese rückgängig zu machen, falls sie den Computer davon abhalten,\n"
-"   das übliche Betriebssystem zu starten.</p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   1. Bearbeiten Sie die **Boot-Reihenfolge**. Abhängig von Ihrem Computermodell\n"
-"   müssten Sie einen Eintrag für **Wechselmedien** oder **USB-Medien** sehen. Bewegen Sie\n"
-"   diesen Eintrag an den Anfang der Liste, um den Computer dazu zu zwingen, von dem\n"
-"   ersten USB-Stick zu starten, bevor von der eingebauten Festplatte gestartet wird.\n"
-
-#. type: Bullet: '   1. '
-msgid "Disable **Fast boot**."
-msgstr "Deaktiveren Sie **Fast boot**."
-
-#. 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 ""
-"   1. Wenn der Computer dazu konfiguriert ist, mit dem **legacy BIOS** zu starten, versuchen\n"
-"   Sie ihn zu konfigurieren, mit **UEFI** zu starten. Ansonsten, wenn der Computer dazu\n"
-"   konfiguriert ist, mit **UEFI** zu starten, versuchen Sie ihn dazu zu konfigurieren, mit dem **legacy\n"
-"   BIOS** zu starten. Um das zu tun, versuchen Sie, falls verfügbar, irgendeine der folgenden Optionen:\n"
-
-#. type: Bullet: '      - '
-msgid "Enable **Legacy mode**"
-msgstr "Aktivieren Sie den **Legacy mode**"
-
-#. 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 "Aktivieren Sie **CSM boot**"
-
-#. type: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Deaktivieren Sie **UEFI**"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Try to upgrade the BIOS to the latest version provided by the manufacturer."
-msgstr ""
-"Versuchen Sie, das BIOS auf die neueste vom Hersteller angebotene Version zu "
-"aktualisieren."
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   ### Berichten Sie das Problem unserem Support-Team\n"
-
-#. 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 ""
-"   <div class=\"bug\">\n"
-"   <p>Falls keine dieser Optionen funktioniert, tut es uns leid, aber\n"
-"   es ist für Sie möglicherweise nicht möglich, Tails auf diesem Computer zu verwenden.</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 ""
-"   [[Senden Sie bitte eine E-Mail an unser Support-Team|support/talk]], die\n"
-"   folgende Informationen enthält:\n"
-
-#. type: Bullet: '   1. '
-msgid "Which version of Tails are you trying to start?"
-msgstr "Welche Version von Tails versuchen Sie zu starten?"
-
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "Wie haben Sie das ISO-Image verifiziert?"
-
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "Von welchem Hersteller und welches Modell ist der Computer?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"What exactly happens when trying to start? Report the complete error message "
-"that appears on the screen, if any."
-msgstr ""
-"Was genau passiert, wenn Sie versuchen Tails zu starten? Falls es eine "
-"Fehlermeldung gibt, geben Sie die gesamte Fehlermeldung an, die auf dem "
-"Bildschirm erscheint."
-
-#. type: Bullet: '   1. '
-msgid "Are you trying to start Tails on a USB stick or a DVD?"
-msgstr "Versuchen Sie Tails von einem USB-Stick oder einer DVD zu starten?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
-"Welches Programm haben Sie zur Installation benutzt, wenn Sie versuchen, "
-"Tails von einem USB-Stick zu starten:"
-
-#. type: Bullet: '      - '
-#, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "<span class=\"application\">Tails Installer</span> oder"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "<span class=\"command\">dd</span> auf der Kommandozeile?"
+"   Fehlerbehebung\n"
+"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Bitte beachten Sie, dass dies die einzigen unterstützten Installationsmethoden sind.\n"
-
-#. 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 ""
-"Konnten Sie Tails auf dem Computer zuvor erfolgreich von einem anderen USB-"
-"Stick bzw. einer DVD oder mit einer anderen Version von Tails starten? Falls "
-"ja, was davon?"
-
-#. type: Bullet: '   1. '
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr ""
-"Startet der gleiche USB-Stick oder die gleiche DVD erfolgreich auf einem "
-"anderen Computer?"
+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"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -794,15 +419,6 @@ 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 ""
@@ -985,115 +601,38 @@ 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 "<div class=\"note clone\">\n"
-#~ msgstr "<div class=\"note clone\">\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"
 
-#, fuzzy
-#~| msgid ""
-#~| "<p>The following instructions assume that the other Tails that you are\n"
-#~| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
-#~| "<span class=\"upgrade\">upgrading</span>\n"
-#~| "from is on a USB stick. You can also\n"
-#~| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
-#~| "<span class=\"upgrade\">upgrade</span>\n"
-#~| "from a Tails DVD in a similar way.</p>\n"
-#~ msgid ""
-#~ "<p>The following instructions assume that the other Tails that you are\n"
-#~ "<span class=\"install-clone windows linux mac 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 windows linux mac 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 debian windows linux mac\">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 debian windows linux mac\">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-tails.png link=\"no\" class="
-#~| "\"debian\"]]\n"
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\"]]\n"
+#~| 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"
 
-#, fuzzy
-#~| msgid ""
-#~| "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class="
-#~| "\"\"]]\n"
 #~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
-#~ "alt=\"Computer restarted on DVD\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class="
-#~ "\"\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</"
-#~ "span> key) until a list of possible startup\n"
+#~ "   <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"
@@ -1101,27 +640,20 @@ 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 ""
@@ -1129,41 +661,35 @@ 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 ""
-#~| "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~| "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
 #~| "\"install-clone mac-clone\"]]\n"
 #~ msgid ""
-#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
 #~ "\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
 #~ msgstr ""
-#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
 #~ "\"install-clone mac-clone\"]]\n"
 
 #~ msgid ""
@@ -1172,9 +698,3 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 #~ msgstr ""
 #~ "   [[!inline pages=\"install/inc/steps/not_entirely.inline.de\" raw=\"yes"
 #~ "\"]]\n"
-
-#~ msgid "<span class=\"application\">Universal USB Installer</span>,"
-#~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
-
-#~ msgid "Disable **Secure boot**"
-#~ msgstr "Deaktivieren Sie **Secure boot**"
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 d89a2deaa54ec91a3721e464684ba9e4b257fe79..e1b1fb6f46bf67bc3754eaef3bcbd91888b97e54 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+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/"
@@ -177,26 +177,50 @@ msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
 #, no-wrap
-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-tails.png link=\"no\" class=\"clone\" alt=\"Memoria USB conectada en la izquierda\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.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-other-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-tails.png link=\"no\" class=\"windows linux mac\" alt=\"Computer restarted on USB stick\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
+#| 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"
+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-other-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-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
+#| 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"
+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
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Memoria USB desconectada en la derecha y computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
+#. type: Plain text
+#, no-wrap
+msgid "<div 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 ""
@@ -205,7 +229,7 @@ msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" cla
 #| "   </p>\n"
 #| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 #| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"install-clone mac-clone\">install</span>\n"
 #| "   <span class=\"upgrade\">upgrade</span>\n"
 #| "   from.</p>\n"
 #| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -230,7 +254,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."
 
@@ -304,413 +328,19 @@ 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 at all\n"
-#| "   ---------------------------\n"
-msgid ""
-"   Troubleshooting: Tails does not start at all\n"
-"   --------------------------------------------\n"
-msgstr ""
-"   Tails no arranca en absoluto\n"
-"   --------------------------------\n"
-
-#. 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 ""
-"   La siguiente sección corresponde si el <span class=\"application\">Menú de Gestor de Arranque</span>\n"
-"   no aparece al comenzar desde una memoria USB.\n"
-
-#. 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 ""
-"   Es bastante común que las computadoras no inicien automáticamente en una\n"
-"   memoria USB que contenga Tails instalado. Estas son algunas técnicas de solución de problemas. Debes probarlas una\n"
-"   luego de la otra.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ### Cómo llegar al menú de arranque\n"
-
-#. 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 ""
-"   En la mayoría de las computadoras, puedes presionar una *tecla de arranque* para mostrar una lista de\n"
-"   posibles dispositivos desde los que puedas iniciar. Las instrucciones siguientes explican cómo\n"
-"   mostrar el menú de inicio y arrancar desde una memoria USB. La siguiente\n"
-"   captura de pantalla es un ejemplo de dicho menú:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-
-#. type: Bullet: '         1. '
-msgid "Shut down the computer."
-msgstr "Apaga la computadora."
-
-#. type: Bullet: '   1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
-msgstr "Asegúrate de que la primera memoria USB esté conectada al ordenador."
-
 #. 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 ""
-"   1. Identifica las posibles teclas del menú de arranque dependiendo del\n"
-"   fabricante según la siguiente lista:\n"
-
-#. 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 ""
-"      <table>\n"
-"        <tr><th>Fabricante</th><th>Tecla</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>otros&hellip;</td><td>F12, Esc</td></tr>\n"
-"      </table>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
-msgstr "      Presiona inmediatamente varias veces la primera tecla potencial del menú de arranque identificada en el paso 3.\n"
-
-#. 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 ""
-"      a. Si aparece un menú de arranque con una lista de dispositivos, selecciona tu memoria USB\n"
-"         y presiona <span class=\"keycap\">Entrar</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      a. If the computer starts on another operating system, then:\n"
-msgstr "      a. Si el equipo se inicia en otro sistema operativo, entonces:\n"
-
-#. type: Bullet: '         1. '
-msgid "Press-and-hold the potential boot menu key identified in step 3."
-msgstr ""
-"Presiona y mantén presionada la tecla potencial del menú de arranque "
-"identificada en el paso 3."
-
-#. type: Bullet: '         1. '
-msgid ""
-"Switch on the computer again while holding the potential boot menu key "
-"pressed."
-msgstr ""
-"Vuelve a encender la computadora mientras mantienes presionada la tecla de "
-"menú de arranque."
-
-#. 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 ""
-"            a. Si aparece un menú de arranque con una lista de dispositivos, selecciona tu memoria USB\n"
-"               y presiona <span class=\"keycap\">Entrar</span>.\n"
-
-#. 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 ""
-"            a. Si la computadora se inicia en otro sistema operativo o devuelve un\n"
-"               mensaje de error, entonces vuelve a apagar la computadora y repite el paso\n"
-"               4 para todas las posibles teclas de menú de inicio identificadas en el paso 3.\n"
-
-#. 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 ""
-"   Si ninguna de las posibles teclas del menú de inicio identificadas en el paso 3 funciona o si\n"
-"   la memoria USB no aparece en la lista, intenta la segunda\n"
-"   técnica de solución de problemas descrita a continuación.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Consulta nuestra lista de problemas conocidos\n"
-
-#. 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 ""
-"   Problemas similares pueden ya haber sido reportados para tu modelo de computadora\n"
-"   en nuestra [[lista de problemas conocidos|support/known_issues]].\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Edit the BIOS settings\n"
-msgstr "   ### Editar la configuración del BIOS\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   You might need to edit the BIOS settings of the computer.\n"
-msgstr "   Puede ser necesario que edites la configuración del BIOS de la computadora.\n"
-
-#. 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 ""
-"   <div class=\"tip\">\n"
-"   <p>Busca el manual de usuario de la computadora en la página web de su\n"
-"   fabricante para aprender a editar la configuración del BIOS:\n"
-"   <ul>\n"
-"     <li>[Acer](https://www.acer.com/ac/es/ES/content/drivers)</li>\n"
-"     <li>[Asus](https://www.asus.com/es/support/)</li>\n"
-"     <li>[Dell](https://www.dell.com/support/home/es/es/esdhs1/Products/)</li>\n"
-"     <li>[Fujitsu](http://www.fujitsu.com/es/support/)</li>\n"
-"     <li>[HP](https://support.hp.com/es-es/products/)</li>\n"
-"     <li>[Lenovo](https://support.lenovo.com/es/es/)</li>\n"
-"     <li>[Samsung](http://www.samsung.com/es/support/downloadcenter/)</li>\n"
-"     <li>[Sony](https://www.sony.es/electronics/support)</li>\n"
-"     <li>[Toshiba](http://www.toshiba.es/support/)</li>\n"
-"   </ul>\n"
-"   </p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   En la configuración del BIOS, prueba aplicar los siguientes cambios uno por uno y\n"
-"   reinicia la computadora después de cada cambio. Algunos cambios tal vez no\n"
-"   aplican para ciertos modelos de computadoras.\n"
-
-#. 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 ""
-"   <div class=\"caution\">\n"
-"   <p>Toma nota de los cambios que aplicas a las configuraciones del BIOS, para poder\n"
-"   revertirlos, si estos impiden que la computadora inicie como lo hace usualmente desde\n"
-"   su sistema operativo.</p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   1. Edita el **Orden de Inicio**. Dependiendo del modelo de la computadora puedes\n"
-"   ver una entrada para **dispositivos removibles** o **memoria USB**. Mueve esta entrada\n"
-"   al principio de la lista para forzar la computadora a intentar iniciar desde\n"
-"   la primer memoria USB antes de iniciar desde el disco duro interno.\n"
-
-#. type: Bullet: '   1. '
-msgid "Disable **Fast boot**."
-msgstr "Deshabilita **Fast boot**."
-
-#. 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 ""
-"   1. Si el ordenador está configurado para arrancar con **legacy BIOS**, intenta\n"
-"   configurarlo para que arranque con **UEFI**. De lo contrario, si está configurada\n"
-"   para arrancar con **UEFI**, intenta configurarla para que arranque con **legacy\n"
-"   BIOS**. Para hacerlo intenta alguno de estos métodos si están disponibles:\n"
-
-#. type: Bullet: '      - '
-msgid "Enable **Legacy mode**"
-msgstr "Habilita **Legacy mode**"
-
-#. type: Bullet: '      - '
-msgid ""
-"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
-"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
-"boot))"
-msgstr ""
-"Deshabilita el **Secure boot** (lee la [documentación de Microsoft](https://"
-"docs.microsoft.com/es-es/windows-hardware/manufacture/desktop/disabling-"
-"secure-boot))"
-
-#. type: Bullet: '      - '
-msgid "Enable **CSM boot**"
-msgstr "Habilita **CSM boot*"
-
-#. type: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Deshabilita **UEFI**"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Try to upgrade the BIOS to the latest version provided by the manufacturer."
-msgstr ""
-"Prueba actualizar el BIOS a la ultima versión disponible del fabricante."
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   ### Reporta el problema a nuestro equipo de soporte\n"
-
-#. 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 ""
-"   <div class=\"bug\">\n"
-"   <p>Si ninguna de estas opciones funciona, lo sentimos pero tal vez no seas\n"
-"   capaz de utilizar Tails en esta computadora.</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 ""
-"   Por favor, [[envía un email a nuestro equipo de soporte|support/talk]], incluyendo\n"
-"   la siguiente información:\n"
-
-#. type: Bullet: '   1. '
-msgid "Which version of Tails are you trying to start?"
-msgstr "¿Cual versión de Tails estas tratando de iniciar?"
-
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "¿Cómo verificaste la imagen ISO?"
-
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "¿Cual es la marca y modelo de la computadora?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"What exactly happens when trying to start? Report the complete error message "
-"that appears on the screen, if any."
-msgstr ""
-"¿Qué pasa exactamente cuando intentas iniciar? Reporta el mensaje de error "
-"completo que aparece en la pantalla, si es que aparece."
-
-#. type: Bullet: '   1. '
-msgid "Are you trying to start Tails on a USB stick or a DVD?"
-msgstr "¿Estás intentando iniciar Tails en una memoria USB o un DVD?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
-"Si estás intentado iniciar en una memoria USB, qué programa utilizaste para "
-"instalarlo:"
-
-#. type: Bullet: '      - '
-#, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "<span class=\"application\">Tails Installer</span>, o"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "¿<span class=\"command\">dd</span> en la linea de comandos?"
+"   Resolución de problemas\n"
+"   -----------------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Ten en cuenta que estos son los únicos métodos de instalación soportados.\n"
-
-#. 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 ""
-"¿Has podido arrancar Tails con éxito en este ordenador antes, desde otra "
-"memoria USB o DVD, o con otra versión de Tails? ¿Con cuál?"
-
-#. type: Bullet: '   1. '
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr ""
-"¿El mismo dispositivo USB o DVD inicia exitosamente en otras computadoras?"
+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"
 
 #. type: Plain text
 #, no-wrap
@@ -775,15 +405,6 @@ 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 ""
@@ -949,118 +570,44 @@ 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 "<div class=\"note clone\">\n"
-#~ msgstr "<div class=\"note clone\">\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>The following instructions assume that the other Tails that you are\n"
-#~| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
-#~| "<span class=\"upgrade\">upgrading</span>\n"
-#~| "from is on a USB stick. You can also\n"
-#~| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
-#~| "<span class=\"upgrade\">upgrade</span>\n"
-#~| "from a Tails DVD in a similar way.</p>\n"
-#~ msgid ""
-#~ "<p>The following instructions assume that the other Tails that you are\n"
-#~ "<span class=\"install-clone windows linux mac 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 windows linux mac 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 debian windows linux mac\">instalando</span>\n"
-#~ "<span class=\"upgrade\">actualizando</span>\n"
-#~ "se encuentra en una memoria USB. También puedes\n"
-#~ "<span class=\"install-clone debian windows linux mac\">instalar</span>\n"
-#~ "<span class=\"upgrade\">actualizar</span>\n"
-#~ "desde un DVD de Tails de un modo similar.</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.es\" 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/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/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\" alt=\"Computadora reiniciada en la memoria USB en la derecha"
-#~ "\"]]\n"
+#~ msgid "   [[!img install/inc/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 "[[!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"
+#~ "   <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 ""
@@ -1074,17 +621,13 @@ 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 ""
@@ -1092,18 +635,15 @@ 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"
@@ -1115,15 +655,9 @@ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Escritor
 #~ "y beneficiarte de las actualizaciones de seguridad automáticas.</p>\n"
 
 #~ msgid ""
-#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
 #~ "\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
 #~ msgstr ""
-#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
 #~ "\"install-clone mac-clone\" alt=\"Memoria USB conectada en la izquierda"
 #~ "\"]]\n"
-
-#~ msgid "<span class=\"application\">Universal USB Installer</span>,"
-#~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
-
-#~ msgid "Disable **Secure boot**"
-#~ msgstr "Deshabilita **Secure boot**"
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 e49c1aa28307c0c1f7a3edbaf4b000c2b6d854af..94e255d44d84c49d525e3093ace7d53c7991fe0e 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+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-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.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\"]]\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"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" 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"
 msgstr ""
 
 #. type: Plain text
@@ -162,48 +162,26 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
-"   </p>\n"
-"   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
-"   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone windows linux mac mac-clone\">install</span>\n"
-"   <span class=\"upgrade\">upgrade</span>\n"
-"   from.</p>\n"
-"   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "Switch on the computer."
+msgid "<div class=\"note clone\">\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   <div class=\"mac mac-clone\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
 msgid ""
-"If the computer starts on Tails, the <span class=\"application\">Boot Loader "
-"Menu</span> appears and Tails starts automatically after 4 seconds.</p>"
+"<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 ""
 "1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+"     <span class=\"usb\">Shut down the computer while leaving the USB stick plugged in.</span>\n"
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
@@ -213,342 +191,67 @@ msgid ""
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "   [[!toggleable id=\"not_at_all\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   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 "      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"
+#. type: Bullet: '1. '
+msgid "Switch on the computer."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   ### Edit the BIOS settings\n"
+msgid "   <div class=\"mac mac-clone\">\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "   You might need to edit the BIOS settings of the computer.\n"
+msgid "   [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\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"
+msgid "   </div>\n"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '1. '
 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"
+"If the computer starts on Tails, the <span class=\"application\">Boot Loader "
+"Menu</span> appears and Tails starts automatically after 4 seconds.</p>"
 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 class=\"note install-clone expert windows linux\">\n"
+"   <p>Most computers do not start on Tails by default. If it does you\n"
+"   are lucky. Otherwise, if the computer starts on\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"windows\">Windows,</span>\n"
+"   <span class=\"linux\">Linux,</span>\n"
+"   <span class=\"install-clone\">Windows or Linux,</span>\n"
+"   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+"   about Tails not starting at all\"]].</p>\n"
 "   </div>\n"
 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"
+msgid "   [[!toggleable id=\"not_at_all\" text=\"\"\"\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"
+msgid "   <span class=\"hide\">[[!toggle id=\"not_at_all\" text=\"\"]]</span>\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. '
-#, fuzzy
-#| msgid "Did you verify the ISO image?"
-msgid "How did you verify the ISO image?"
-msgstr "آیا تصویر ایزو را تأیید کرده‌اید؟"
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid "Which is the brand, and model of the computer?"
-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?"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid ""
-#| "Have you been able to start Tails successfully on this computer before, "
-#| "from another media, or with another version of Tails? If so, which ones?"
-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?"
+msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""
-"آیا پیش از این توانسته بودید از دستگاهی دیگر یا نسخهٔ دیگری از تیلز را با "
-"موفقیت روی این رایانه نصب کنید؟ اگر پاسخ مثبت است، با چه دستگاهی یا چه "
-"نسخه‌ای را؟"
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid "Does the same media start successfully on other computers?"
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr "آیا همان روش و دستگاه روی رایانه‌های دیگر به درستی راه‌اندازی می‌شود؟"
 
 #. type: Plain text
 #, no-wrap
@@ -600,13 +303,6 @@ 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 ""
@@ -731,27 +427,3 @@ msgstr ""
 #, no-wrap
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
-
-#~ msgid ""
-#~ "From which media are you trying to start Tails: DVD, USB stick "
-#~ "[[installed manually|doc/first_steps/installation/manual]], USB stick "
-#~ "[[installed with Tails Installer|doc/first_steps/installation]], SD card? "
-#~ "Keep in mind that, we do not support any other installation method than "
-#~ "the ones listed above."
-#~ msgstr ""
-#~ "از چه طریقی قصد راه‌اندازی تیلز را دارید: دی‌وی‌دی، درایو یواس‌بی با [[نصب "
-#~ "دستی|doc/first_steps/installation/manual]]، درایو یواس‌بی با [[نصب از طریق "
-#~ "نصب‌کنندهٔ تیلز|doc/first_steps/installation]] یا کارت حافظه؟ در خاطر داشته "
-#~ "باشید که ما هیچ روش نصب دیگری به جز موارد مذکور را پشتیبانی نمی‌کنیم."
-
-#~ msgid ""
-#~ "Have you been able to start Tails successfully on the same computer using "
-#~ "different installation methods? For example, it might start from a DVD "
-#~ "but not from a USB stick."
-#~ msgstr ""
-#~ "آیا پیش از این توانسته بودید تیلز را با روش نصب دیگری روی همان رایانه نصب "
-#~ "کنید؟ برای نمونه ممکن است تیلز از یک دی‌وی‌دی راه‌اندازی شود، اما از روی "
-#~ "درایو یواس‌بی نه."
-
-#~ msgid "What installation method did you use to set up Tails?"
-#~ msgstr "از چه روش نصبی برای تنظیم تیلز استفاده کردید؟"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
index aea16593eebdbf9ef5efb94ef035b1121f20b881..2059ee1a44062018a19a7a0499db44d76f172b3d 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+0000\n"
 "PO-Revision-Date: 2018-04-20 11:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -174,26 +174,50 @@ msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
 #, no-wrap
-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-tails.png link=\"no\" class=\"clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.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-other-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-tails.png link=\"no\" class=\"windows linux mac\" alt=\"Computer restarted on USB stick\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
+#| 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"
+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-other-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-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
+#| 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"
+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
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Clé USB débranchée sur la droite et ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
+#. type: Plain text
+#, no-wrap
+msgid "<div 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 ""
@@ -202,7 +226,7 @@ msgstr "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" cla
 #| "   </p>\n"
 #| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 #| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"install-clone mac-clone\">install</span>\n"
 #| "   <span class=\"upgrade\">upgrade</span>\n"
 #| "   from.</p>\n"
 #| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -226,7 +250,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."
 
@@ -300,421 +324,19 @@ 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 at all\n"
-#| "   ---------------------------\n"
-msgid ""
-"   Troubleshooting: Tails does not start at all\n"
-"   --------------------------------------------\n"
-msgstr ""
-"   Tails ne démarre pas du tout\n"
-"   ----------------------------\n"
-
-#. 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 ""
-"   La section suivante s'applique si le <span class=\"application\">menu du chargeur d’amorçage</span>\n"
-"   n'apparaît pas en démarrant sur la clé USB.\n"
-
-#. 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 ""
-"   Il est relativement fréquent que les ordinateurs ne démarrent pas automatiquement\n"
-"   sur une clé USB avec Tails installé. Voici quelques techniques pour tenter de résoudre le \n"
-"   problème. Vous devriez les essayer l'une après l'autre.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ### Obtenir le menu de démarrage\n"
-
-#. 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 ""
-"   Sur la plupart des ordinateurs, il est possible d'appuyer sur une touche\n"
-"   afin d'obtenir un menu (souvent appelé *Boot Menu*) permettant de choisir \n"
-"   le périphérique sur lequel démarrer. Les instructions suivantes expliquent\n"
-"   comment afficher le menu et démarrer sur la clé USB. La capture d'écran qui\n"
-"   suit montre l'exemple d'un tel menu :\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-
-#. type: Bullet: '         1. '
-msgid "Shut down the computer."
-msgstr "Éteindre l'ordinateur."
-
-#. type: Bullet: '   1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
-msgstr "S'assurer que la première clé USB est branchée à l'ordinateur."
-
-#. 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 ""
-"   1. Identifier la touche pour obtenir le *Boot Menu*.\n"
-"   La liste suivante donne des possibilités selon la marque de l'ordinateur :\n"
-
-#. 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 ""
-"      <table>\n"
-"        <tr><th>Fabriquant</th><th>Touche</th></tr>\n"
-"        <tr><td>Acer</td><td>Échap., F12, F9</td></tr>\n"
-"        <tr><td>Asus</td><td>Échap., F8</td></tr>\n"
-"        <tr><td>Dell</td><td>F12</td></tr>\n"
-"        <tr><td>Fujitsu</td><td>F12, Échap.</td></tr>\n"
-"        <tr><td>HP</td><td>Échap., F9</td></tr>\n"
-"        <tr><td>Lenovo</td><td>F12, Novo, F8, F10</td></tr>\n"
-"        <tr><td>Samsung</td><td>Échap., F12, F2</td></tr>\n"
-"        <tr><td>Sony</td><td>F11, Échap., F10</td></tr>\n"
-"        <tr><td>Toshiba</td><td>F12</td></tr>\n"
-"        <tr><td>autres&hellip;</td><td>F12, Échap.</td></tr>\n"
-"      </table>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
-msgstr "      Immédiatement après, appuyer plusieurs fois sur la première des touches possibles identifiée à l'étape 3.\n"
-
-#. 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 ""
-"      a. Si un menu avec une liste de périphériques apparaît, choisir votre clé USB\n"
-"         et appuyer sur <span class=\"keycap\">Entrée</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      a. If the computer starts on another operating system, then:\n"
-msgstr "      a. Si l'ordinateur démarre sur un autre système d'exploitation, alors :\n"
-
-#. type: Bullet: '         1. '
-msgid "Press-and-hold the potential boot menu key identified in step 3."
-msgstr ""
-"Maintenir appuyé la touche de démarrage potentielle identifiée à l'étape 3."
-
-#. type: Bullet: '         1. '
-msgid ""
-"Switch on the computer again while holding the potential boot menu key "
-"pressed."
-msgstr ""
-"Démarrer l'ordinateur de nouveau tout en gardant appuyé la touche possible."
-
-#. 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 ""
-"            a. Si un menu avec une liste de périphériques apparaît, choisir votre clé\n"
-"               USB et appuyer sur <span class=\"keycap\">Entrée</span>.\n"
-
-#. 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 ""
-"            a. Si l'ordinateur démarre un autre système d'exploitation ou qu'il\n"
-"               affiche un message d'erreur, l'éteindre à nouveau et répéter l'étape\n"
-"               4 pour chacune des touches possibles identifiées à l'étape 3.\n"
-
-#. 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 ""
-"   Si aucune des touches possibles identifiées lors de l'étape 3 ne fonctionne\n"
-"   ou que la clé USB n'apparaît pas dans la liste, alors essayer la technique\n"
-"   décrite ci-dessous.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Vérifier la liste des problèmes connus\n"
-
-#. 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 ""
-"   Des problèmes similaires ont peut-être été déjà documenté pour votre modèle\n"
-"   d'ordinateur dans notre [[liste des problèmes connus|support/known_issues]].\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Edit the BIOS settings\n"
-msgstr "   ### Modifier les réglages du BIOS\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   You might need to edit the BIOS settings of the computer.\n"
-msgstr "   Il est possible qu'il soit nécessaire de modifier les réglages du BIOS de l'ordinateur.\n"
-
-#. 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 ""
-"   <div class=\"tip\">\n"
-"   <p>Chercher le mode d'emploi de l'ordinateur sur le site de son fabriquant\n"
-"   afin d'apprendre comment modifier les réglages du BIOS :\n"
-"   <ul>\n"
-"     <li>[Acer](http://www.acer.com/ac/fr/FR/content/drivers)</li>\n"
-"     <li>[Asus](https://www.asus.com/fr/support/)</li>\n"
-"     <li>[Dell](https://www.dell.com/support/home/fr/fr/19/Products/)</li>\n"
-"     <li>[Fujitsu](http://www.fujitsu.com/fr/support/)</li>\n"
-"     <li>[HP](http://support.hp.com/fr-fr/products/)</li>\n"
-"     <li>[Lenovo](http://support.lenovo.com/fr/fr/)</li>\n"
-"     <li>[Samsung](http://www.samsung.com/fr/support/)</li>\n"
-"     <li>[Sony](https://www.sony.fr/support/fr/)</li>\n"
-"     <li>[Toshiba](http://www.toshiba.fr/innovation/generic/SUPPORT_PORTAL/)</li>\n"
-"   </ul>\n"
-"   </p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   Dans les réglages du BIOS, essayer d'appliquer les modifications suivantes une par une\n"
-"   et redémarrer l'ordinateur après chaque changement. Certaines modifications\n"
-"   peuvent ne pas s'appliquer à certains modèles d'ordinateurs.\n"
-
-#. 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 ""
-"   <div class=\"caution\">\n"
-"   <p>Prenez note des changements que vous faites sur les réglages\n"
-"   du BIOS afin de pouvoir rétablir les anciens paramètres au cas où\n"
-"   il deviendrait impossible de démarrer l'ordinateur sur son système\n"
-"   d'exploitation habituel.\n"
-"   </p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   1. Modifier l'ordre des périphériques (*Boot Order*) sur lequel\n"
-"   l'ordinateur cherche un système d'exploitation. Selon le modèle,\n"
-"   vous devriez voir une entrée pour les périphériques amovibles\n"
-"   (*removable devices*) ou pour les supports USB (*USB media*).\n"
-"   Remonter cette entrée en haut de la liste afin de forcer l'ordinateur\n"
-"   à essayer de démarrer sur la première clé USB avant qu'il ne démarre\n"
-"   sur le disque interne.\n"
-
-#. type: Bullet: '   1. '
-msgid "Disable **Fast boot**."
-msgstr "Désactiver le démarrage rapide (*Fast boot*)."
-
-#. 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 ""
-"   1. Si l'ordinateur est configuré pour démarrer en mode « compatibilité BIOS »\n"
-"   (*legacy BIOS*), essayer de le mettre en mode *UEFI*. À l'opposé, au cas où\n"
-"   il est configuré en mode *UEFI*, essayer de le configurer pour démarrer en\n"
-"   mode « compatibilité BIOS » (*legacy BIOS*). Pour cela, essayer l'une ou\n"
-"   l'autre des options suivantes selon leur disponibilité :\n"
-
-#. type: Bullet: '      - '
-msgid "Enable **Legacy mode**"
-msgstr "Activer le mode « compatibilité BIOS » (*Legacy BIOS*)"
-
-#. type: Bullet: '      - '
-msgid ""
-"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
-"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
-"boot))"
-msgstr ""
-"Désactiver **Secure boot** (voir la [documentation Microsoft](https://docs."
-"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
-"boot) en anglais)"
-
-#. type: Bullet: '      - '
-msgid "Enable **CSM boot**"
-msgstr "Activer l'option de démarrage « CSM » (*CSM boot*)"
-
-#. type: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Désactiver l'*UEFI*"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Try to upgrade the BIOS to the latest version provided by the manufacturer."
-msgstr ""
-"Essayer de mettre à jour le BIOS vers la dernière version disponible chez le "
-"fabriquant de l'ordinateur."
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   ### Signaler le problème à notre équipe d'assistance\n"
-
-#. 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 ""
-"   <div class=\"bug\">\n"
-"   <p>Si aucune de ces options ne marche, nous sommes désolés mais il est possible que vous ne\n"
-"   puissiez pas utiliser Tails sur cet ordinateur.</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 ""
-"   Veuillez [[envoyer un courrier électronique à notre équipe d'assistance|support/talk]], en incluant\n"
-"   les informations suivantes :\n"
-
-#. type: Bullet: '   1. '
-msgid "Which version of Tails are you trying to start?"
-msgstr "Quelle version de Tails essayez-vous de démarrer ?"
-
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "Comment avez-vous vérifié l'image ISO ?"
-
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "Quelle est la marque et le modèle de l'ordinateur ?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"What exactly happens when trying to start? Report the complete error message "
-"that appears on the screen, if any."
-msgstr ""
-"Que se passe-t-il exactement lors des tentatives de démarrage ? S'il y en a "
-"un, rapportez entièrement le message d'erreur qui apparaît à l'écran."
-
-#. type: Bullet: '   1. '
-msgid "Are you trying to start Tails on a USB stick or a DVD?"
-msgstr "Essayez-vous de démarrer Tails sur une clé USB ou un DVD ?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
-"Si vous essayez de démarrer sur une clé USB, quel programme avez-vous "
-"utilisé pour l'installer :"
-
-#. type: Bullet: '      - '
-#, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "l'utilitaire <span class=\"application\">GNOME Disques</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "l'utilitaire <span class=\"application\">GNOME Disques</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "l'<span class=\"application\">Installeur de Tails</span> ou"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "<span class=\"command\">dd</span> en ligne de commande ?"
+"   Résolution des problèmes\n"
+"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Notez que ce sont les seules méthodes d'installation supportées.\n"
-
-#. 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 ""
-"Avez-vous déjà réussi à démarrer Tails correctement sur cet ordinateur "
-"auparavant, depuis une autre clé USB ou un DVD, ou avec une autre version de "
-"Tails ? Si oui, lesquelles ?"
-
-#. type: Bullet: '   1. '
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr ""
-"Est-ce que la même clé USB ou le même DVD démarre correctement sur d'autres "
-"ordinateurs ?"
+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"
 
 #. type: Plain text
 #, no-wrap
@@ -785,15 +407,6 @@ 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 ""
@@ -959,119 +572,46 @@ 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 "<div class=\"note clone\">\n"
-#~ msgstr "<div class=\"note clone\">\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>The following instructions assume that the other Tails that you are\n"
-#~| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
-#~| "<span class=\"upgrade\">upgrading</span>\n"
-#~| "from is on a USB stick. You can also\n"
-#~| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
-#~| "<span class=\"upgrade\">upgrade</span>\n"
-#~| "from a Tails DVD in a similar way.</p>\n"
-#~ msgid ""
-#~ "<p>The following instructions assume that the other Tails that you are\n"
-#~ "<span class=\"install-clone windows linux mac 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 windows linux mac 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 debian windows linux mac\">installé</span>\n"
-#~ "<span class=\"upgrade\">mis à jour</span>\n"
-#~ "est sur une clé USB. Vous pouvez également\n"
-#~ "<span class=\"install-clone debian windows linux mac\">installer</span>\n"
-#~ "<span class=\"upgrade\">mettre à jour</span>\n"
-#~ "depuis un DVD Tails de façon similaire.</p>\n"
+#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
 
-#~ msgid ""
-#~ "   [[!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_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/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
-#~ "qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
-#~ "qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
-#~ "\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
-#~ "\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite"
-#~ "\"]]\n"
-
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
-#~ "alt=\"Computer restarted on DVD\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
-#~ "alt=\"Ordinateur redémarrant sur un DVD\"]]\n"
+#~ msgid "[[!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 ""
@@ -1080,23 +620,18 @@ 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 ""
@@ -1104,67 +639,22 @@ 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"
-
-#~ msgid "<span class=\"application\">Universal USB Installer</span>,"
-#~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
-
-#~ msgid "Disable **Secure boot**"
-#~ msgstr "Désactiver le « démarrage sécurisé » (*Secure boot*)"
-
-#~ msgid ""
-#~ "From which media are you trying to start Tails: DVD, USB stick "
-#~ "[[installed manually|doc/first_steps/installation/manual]], USB stick "
-#~ "[[installed with Tails Installer|doc/first_steps/installation]], SD card? "
-#~ "Keep in mind that, we do not support any other installation method than "
-#~ "the ones listed above."
-#~ msgstr ""
-#~ "Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé USB "
-#~ "[[installée manuellement|/doc/first_steps/installation/manual]], clé USB "
-#~ "[[installée avec l'installeur USB Tails|/doc/first_steps/installation]], "
-#~ "carte SD ? Sachez que nous ne prenons en charge aucun autre moyen "
-#~ "d'installation que ceux décrits ci-dessus."
-
-#~ msgid ""
-#~ "Have you been able to start Tails successfully on the same computer using "
-#~ "different installation methods? For example, it might start from a DVD "
-#~ "but not from a USB stick."
-#~ msgstr ""
-#~ "Avez-vous déjà réussi à démarrer Tails correctement sur ce même "
-#~ "ordinateur, en utilisant une méthode d'installation différente ? Par "
-#~ "exemple, il pourrait démarrer avec un DVD et non avec une clé USB."
-
-#~ msgid "What installation method did you use to set up Tails?"
-#~ msgstr "Quelle méthode avez-vous utilisée pour installer Tails ?"
-
-#~ msgid ""
-#~ "   If none of these options work, please [[report the problem to our\n"
-#~ "   support team|doc/first_steps/bug_reporting/tails_does_not_start]].\n"
-#~ msgstr ""
-#~ "   Si aucune de ces options ne fonctionne, veuillez [[rapporter le "
-#~ "problème\n"
-#~ "   à notre équipe de support|doc/first_steps/bug_reporting/"
-#~ "tails_does_not_start]].\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 2e9166cecde0483bb9aa34bb88ff32f418724b79..9b4177115a9b67944acdf3c5a416ca6209f164a0 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+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"
@@ -175,27 +175,51 @@ msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+#| 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"
+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-other-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\"]]\n"
-msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
+#| 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"
+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/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+#| 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"
+msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"USB stick unplugged on the right and computer restarted on USB stick on the left\"]]\n"
 msgstr ""
 
+#. type: Plain text
+#, no-wrap
+msgid "<div 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 ""
@@ -204,7 +228,7 @@ msgstr ""
 #| "   </p>\n"
 #| "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 #| "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-#| "   <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "   <span class=\"install-clone mac-clone\">install</span>\n"
 #| "   <span class=\"upgrade\">upgrade</span>\n"
 #| "   from.</p>\n"
 #| "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -229,7 +253,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."
 
@@ -308,430 +332,19 @@ 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 at all\n"
-#| "   ---------------------------\n"
-msgid ""
-"   Troubleshooting: Tails does not start at all\n"
-"   --------------------------------------------\n"
-msgstr ""
-"   Tails non si avvia affatto\n"
-"   ----------------------------\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span>\n"
-#| "   menu does not appear when starting on a USB stick.\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 sezione seguente si applica se il menù <span class=\"guilabel\">Avvia Tails</span>\n"
-"   non appare quando si avvia da chiave USB.\n"
-
-#. 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 ""
-"   E' abbastanza comune per i computer non avviarsi automaticamente su una\n"
-"   chiave USB con Tails installata. Qui ci sono alcune tecniche di risoluzione dei problemi.\n"
-"   Dovresti provarle una dopo l'altra.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ###Arrivare al menù di avvio\n"
-
-#. 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 ""
-"   Sulla maggior parte dei computer, puoi premere un *tasto menù d'avvio* per mostrare una\n"
-"   lista di possibili dispositivi dai quali partire. Le istruzioni seguenti spiegano come\n"
-"   far comparire il menù di avvio e avviare su una chiave USB. Il seguente screenshot\n"
-"   è un esempio di questo menù di avvio:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr "   [[!img install/inc/screenshots/bios_boot_menu.png link=\"no\" alt=\"\"]]\n"
-
-#. type: Bullet: '         1. '
-msgid "Shut down the computer."
-msgstr "Spegni il computer."
-
-#. type: Bullet: '   1. '
-msgid "Make sure that the first USB stick is plugged in the computer."
-msgstr "Assicurati che la prima chiave USB sia collegata al computer."
-
-#. 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 ""
-"   1. Identifica il potenziale tasto menù d'avvio per il computer a seconda del\n"
-"   suo produttore dalla seguente lista:\n"
-
-#. 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 ""
-"      <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>altri&hellip;</td><td>F12, Esc</td></tr>\n"
-"      </table>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      Immediately press several times the first potential boot menu key identified in step 3.\n"
-msgstr "       Premi immediatamente e ripetutamente il primo possibile tasto menù d'avvio identificato nel passaggio 3.\n"
-
-#. 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 ""
-"      a. Se compare un menù d'avvio con una lista di dispositivi, seleziona la tua chiave USB\n"
-"          e premi <span class=\"keycap\">Invio</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "      a. If the computer starts on another operating system, then:\n"
-msgstr "      a. Se il computer si avvia da un altro sistema operativo, allora:\n"
-
-#. type: Bullet: '         1. '
-msgid "Press-and-hold the potential boot menu key identified in step 3."
-msgstr ""
-"Premi e tieni premuto il potenziale tasto menù d'avvio identificato nel "
-"passaggio 3."
-
-#. type: Bullet: '         1. '
-msgid ""
-"Switch on the computer again while holding the potential boot menu key "
-"pressed."
-msgstr ""
-"Riaccendi di nuovo il computer tenendo premuto il potenziale tasto menù di "
-"avvio."
-
-#. 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 ""
-"            a. Se compare un menù d'avvio con una lista di dispositivi, seleziona la tua chiave USB\n"
-"                e premi <span class=\"keycap\">Invio</span>.\n"
-"\n"
-
-#. 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 ""
-"            a. Se il computer si avvia su un altro sistema operativo o ritorna un\n"
-"                messaggio d'errore, spegnilo di nuovo e ripeti il passaggio 4\n"
-"                per tutti i potenziali tasti menù d'avvio identificati nel passaggio 3.\n"
-
-#. 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 ""
-"   Se nessuno dei potenziali tasti menù d'avvio identificati nel passaggio 3 funziona o se\n"
-"   la chiave USB non compare nella lista, allora prova la seconda tecnica di\n"
-"   risoluzione problemi descritta di seguito.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Controlla la nostra lista di problemi conosciuti\n"
-
-#. 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 ""
-"   Problemi simili potrebbero essere stati già riportati per il tuo modello di computer\n"
-"   nella nostra [[lista di problemi conosciuti|support/known_issues]].\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Edit the BIOS settings\n"
-msgstr "   ### Modifica le impostazioni del BIOS\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   You might need to edit the BIOS settings of the computer.\n"
-msgstr "   Potresti dover modificare le impostazioni del BIOS del tuo computer.\n"
-
-#. type: Plain text
-#, fuzzy, 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](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
-#| "     <li>[Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/)</li>\n"
-#| "     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
-#| "     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
-#| "     <li>[HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/)</li>\n"
-#| "     <li>[Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/)</li>\n"
-#| "     <li>[Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads)</li>\n"
-#| "     <li>[Sony](http://esupport.sony.com/US](http://esupport.sony.com/US)</li>\n"
-#| "     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
-#| "   </ul>\n"
-#| "   </p>\n"
-#| "   </div>\n"
-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 ""
-"   <div class=\"tip\">\n"
-"   <p>Cerca il manuale del computer sul sito del suo\n"
-"   produttore per imparare come modificare le impostazioni del BIOS:\n"
-"   <ul>\n"
-"     <li>[Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
-"     <li>[Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/)</li>\n"
-"     <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
-"     <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
-"     <li>[HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/)</li>\n"
-"     <li>[Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/)</li>\n"
-"     <li>[Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads)</li>\n"
-"     <li>[Sony](http://esupport.sony.com/US](http://esupport.sony.com/US)</li>\n"
-"     <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
-"   </ul>\n"
-"   </p>\n"
-"   </div>\n"
-
-#. 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 ""
-"    Nelle impostazioni del BIOS, prova ad applicare i seguenti cambiamenti uno a uno e\n"
-"    riavvia il computer dopo ogni modifica. Alcuni cambiamenti potrebbero non\n"
-"    applicarsi a certi modelli di computer.\n"
-
-#. 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 ""
-"   <div class=\"caution\">\n"
-"   <p>Prendi nota delle modifiche che applichi alle impostazioni del BIOS, per\n"
-"    poterle annullare se impediscono al computer di avviarsi con il suo solito\n"
-"    sistema operativo.</p>\n"
-"   </div>\n"
-
-#. 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 ""
-"   1.  Modifica l'**Ordine di Avvio**. A seconda del modello di computer, potresti vedere\n"
-"   un'opzione per **dispositivi removibili** o **USB media**. Sposta questa opzione\n"
-"   in cima alla lista per forzare il computer a tentare di avviarsi dalla prima\n"
-"   chiave USB prima di avviarsi dall'hard disk interno.\n"
-
-#. type: Bullet: '   1. '
-msgid "Disable **Fast boot**."
-msgstr "Disabilita **Avvio rapido**."
-
 #. 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 ""
-"   1. Se il computer è configurato per avviarsi con **legacy BIOS**, prova a\n"
-"   configurarlo per avviarsi con **UEFI**. Oppure, se il computer è configurato\n"
-"   per avviarsi con **UEFI**, prova a configurarlo per avviarsi con **legacy\n"
-"   BIOS**. Per fare questo, prova una delle seguenti opzioni se disponibile:\n"
-
-#. type: Bullet: '      - '
-msgid "Enable **Legacy mode**"
-msgstr "Abilita **Legacy mode**"
-
-#. 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 "Abilita **CSM boot**"
-
-#. type: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Disabilita **UEFI**"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Try to upgrade the BIOS to the latest version provided by the manufacturer."
-msgstr ""
-"Prova ad aggiornare il BIOS all'ultima versione provvista dal produttore."
-
-#. type: Plain text
-#, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   # Riporta i problemi al nostro team di supporto\n"
-
-#. 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 ""
-"   <div class=\"bug\">\n"
-"   <p>Se nessuna di queste opzioni funziona, ci dispiace ma potresti non essere\n"
-"    in grado di usare Tails su questo computer.</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 ""
-"   Per favore, [[manda un'email al nostro team di supporto|support/talk]], includendo\n"
-"   le informazioni seguenti\n"
-
-#. type: Bullet: '   1. '
-msgid "Which version of Tails are you trying to start?"
-msgstr "Che versione di Tails stai provando ad avviare?"
-
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "Come hai verificato l'immagine ISO?"
-
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "Quali sono la marca e il modello del computer?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"What exactly happens when trying to start? Report the complete error message "
-"that appears on the screen, if any."
-msgstr ""
-"Cosa è successo esattamente quando hai provato ad avviare? Riporta il "
-"messaggio d'errore intero che appare sullo schermo, se c'è."
-
-#. type: Bullet: '   1. '
-msgid "Are you trying to start Tails on a USB stick or a DVD?"
-msgstr "Stai provando ad avviare Tails da una chiavetta USB o da un DVD?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
-"Se stai provando ad avviare Tails da una chiave USB, che programma hai usato "
-"per installarla:"
-
-#. type: Bullet: '      - '
-#, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "<span class=\"application\">Tails Installer</span>, o"
-
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "<span class=\"command\">dd</span> sulla riga di comando?"
+"   Risoluzione dei problemi\n"
+"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Nota che queste sono gli unici metodi di installazione supportati.\n"
-
-#. 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 ""
-"In passato sei riuscita ad avviare Tails con successo su questo computer, da "
-"un'altra chiave USB o DVD, o con un'altra versione di Tails? Se sì, quale?"
-
-#. type: Bullet: '   1. '
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr "La stessa chiave USB o DVD si avvia con successo su altri computer?"
+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"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -806,15 +419,6 @@ 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 ""
@@ -991,69 +595,23 @@ 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"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>The following instructions assume that the other Tails that you are\n"
-#~| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
-#~| "<span class=\"upgrade\">upgrading</span>\n"
-#~| "from is on a USB stick. You can also\n"
-#~| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
-#~| "<span class=\"upgrade\">upgrade</span>\n"
-#~| "from a Tails DVD in a similar way.</p>\n"
-#~ msgid ""
-#~ "<p>The following instructions assume that the other Tails that you are\n"
-#~ "<span class=\"install-clone windows linux mac 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 windows linux mac 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 debian windows linux mac\">installando</span>\n"
-#~ "<span class=\"upgrade\">aggiornando</span>\n"
-#~ "sia su una chiave USB. Puoi anche\n"
-#~ "<span class=\"install-clone debian windows linux mac\">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"
+#~ "   <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"
@@ -1066,17 +624,13 @@ 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 ""
@@ -1090,12 +644,10 @@ 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"
@@ -1227,9 +779,3 @@ msgstr ""
 
 #~ msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 #~ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
-
-#~ msgid "<span class=\"application\">Universal USB Installer</span>,"
-#~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
-
-#~ msgid "Disable **Secure boot**"
-#~ msgstr "Disabilita **Avvio sicuro**"
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 ee0874a6d28a339beafcb5bd44f6bc5abbff246f..7768299864d0b6ea3e24c08d48bffbf3c1ce6104 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-11 19:27+0000\n"
+"POT-Creation-Date: 2018-11-17 10:57+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"
@@ -145,17 +145,17 @@ msgstr "<div class=\"step-image\">\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.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\"]]\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"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone\" 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"
 msgstr ""
 
 #. type: Plain text
@@ -163,6 +163,23 @@ 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 ""
@@ -171,13 +188,13 @@ msgid ""
 "   </p>\n"
 "   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
 "   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone windows linux mac mac-clone\">install</span>\n"
+"   <span class=\"install-clone mac-clone\">install</span>\n"
 "   <span class=\"upgrade\">upgrade</span>\n"
 "   from.</p>\n"
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Bullet: '   1. '
+#. type: Bullet: '1. '
 msgid "Switch on the computer."
 msgstr ""
 
@@ -205,15 +222,16 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"1. <p>\n"
-"     <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
-"   </p>\n"
-"   <p class=\"clone upgrade-tails\">Shut down the computer.</p>\n"
-"   <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-"   <span class=\"install-clone mac-clone\">install</span>\n"
-"   <span class=\"upgrade\">upgrade</span>\n"
-"   from.</p>\n"
-"   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
+"   <div class=\"note install-clone expert windows linux\">\n"
+"   <p>Most computers do not start on Tails by default. If it does you\n"
+"   are lucky. Otherwise, if the computer starts on\n"
+"   <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+"   <span class=\"windows\">Windows,</span>\n"
+"   <span class=\"linux\">Linux,</span>\n"
+"   <span class=\"install-clone\">Windows or Linux,</span>\n"
+"   refer to  [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+"   about Tails not starting at all\"]].</p>\n"
+"   </div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,328 +247,14 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   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 "      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 "Qual versão do Tails você está tentando iniciar?"
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid "Did you verify the ISO image?"
-msgid "How did you verify the ISO image?"
-msgstr "Você verificou a imagem ISO?"
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid "Which is the brand, and model of the computer?"
-msgid "Which is the brand and model of the computer?"
-msgstr "Quais são a marca e o modelo do computador?"
-
-#. type: Bullet: '   1. '
-msgid ""
-"What exactly happens when trying to start? Report the complete error message "
-"that appears on the screen, if any."
-msgstr ""
-"O que acontece exatamente quando você tenta inicializar? Relate a mensagem "
-"de erro completa que aparece na tela, se aparecer alguma."
-
-#. 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?"
+"   Troubleshooting\n"
+"   ---------------\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid ""
-#| "Have you been able to start Tails successfully on this computer before, "
-#| "from another media, or with another version of Tails? If so, which ones?"
-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?"
+msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr ""
-"Você conseguiu iniciar o Talis com sucesso neste computador antes, a partir "
-"de uma outra mídia ou com outra versão do Tails? Se sim, quais?"
-
-#. type: Bullet: '   1. '
-#, fuzzy
-#| msgid "Does the same media start successfully on other computers?"
-msgid "Does the same USB stick or DVD start successfully on other computers?"
-msgstr "A mesma mídia inicializa com sucesso em outros computadores?"
 
 #. type: Plain text
 #, no-wrap
@@ -602,13 +306,6 @@ 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 ""
@@ -733,31 +430,3 @@ msgstr "Após 15&ndash;30 segundos, a área de trabalho do Tails aparece."
 #, no-wrap
 msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
-
-#~ msgid "<div class=\"note clone\">\n"
-#~ msgstr "<div class=\"note clone\">\n"
-
-#~ msgid ""
-#~ "From which media are you trying to start Tails: DVD, USB stick "
-#~ "[[installed manually|doc/first_steps/installation/manual]], USB stick "
-#~ "[[installed with Tails Installer|doc/first_steps/installation]], SD card? "
-#~ "Keep in mind that, we do not support any other installation method than "
-#~ "the ones listed above."
-#~ msgstr ""
-#~ "Através de que mídia você está tentando inicializar o Tails: DVD, memória "
-#~ "USB [[instalada manualmente|doc/first_steps/installation/manual]], "
-#~ "memória USB [[instalado com o instalador do Tails|doc/first_steps/"
-#~ "installation]], cartão SD? Tenha em mente que nós não oferecemos suporte "
-#~ "a métodos de instalação que não sejam os listados acima."
-
-#~ msgid ""
-#~ "Have you been able to start Tails successfully on the same computer using "
-#~ "different installation methods? For example, it might start from a DVD "
-#~ "but not from a USB stick."
-#~ msgstr ""
-#~ "Você conseguiu iniciar o Tails com sucesso no mesmo computador usando "
-#~ "métodos diferentes de instalação? Por exemplo, ele consegue iniciar de um "
-#~ "DVD mas não de uma memória USB."
-
-#~ msgid "What installation method did you use to set up Tails?"
-#~ msgstr "Que método de instalação você usou para  configurar o Tails?"