diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index 8bd0653ac57b40a161024050c5394918aba7cf6e..9fd5be72a90bf8403c1aa61cc457e913741a7c46 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb 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-usb 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-usb\">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
@@ -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=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO-"
@@ -164,20 +164,19 @@ msgstr "Herunterladen"
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid ""
-#| "[[!img install/inc/infography/restart-on-other-tails.png link=\"no"
-#| "\"]]"
+#| "[[!img install/inc/infography/restart-on-other-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-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\" "
-"alt=\"Computer neugestartet und USB-Stick zur linken Seite\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer neugestartet und USB-Stick zur linken Seite\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -187,8 +186,8 @@ msgstr "Neustarten"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -199,7 +198,7 @@ msgstr "Installieren"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO-"
@@ -217,33 +216,32 @@ msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
-#| msgid ""
-#| "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
+#| msgid "[[!img install/inc/infography/clone-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-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-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-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">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-usb\">Installieren</span> "
-"<span class=\"upgrade\">Aktualisieren</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Installieren</"
+"span> <span class=\"upgrade\">Aktualisieren</span>"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Verschlüsselung auf dem USB-Stick zur rechten Seite eingerichtet\"]]"
@@ -279,17 +277,17 @@ msgstr "Konfigurieren"
 #, fuzzy
 #~| msgid ""
 #~| "<span class=\"windows linux mac-usb\">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-usb 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-usb\">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 ""
@@ -321,23 +319,23 @@ msgstr "Konfigurieren"
 #~| "First you will <span class=\"windows linux mac-usb\">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-usb\">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-usb\">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
@@ -366,17 +364,18 @@ msgstr "Konfigurieren"
 #~ msgid ""
 #~ "Then you will <span class=\"windows linux mac-usb\">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-usb\">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 e6cc0063b6f82b5056bb073f866694a1b1a385e0..561fcf0b04fec6e49d425a55036c8750d2c374ea 100644
--- a/wiki/src/install/inc/overview.es.po
+++ b/wiki/src/install/inc/overview.es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb\">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-usb 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-usb\">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
@@ -148,8 +148,12 @@ msgid "Your steps"
 msgstr "Tus pasos"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+#| "\"ISO image downloaded and verified\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -166,18 +170,18 @@ msgstr "Descargar"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
 "\"imagen ISO descargada y verificada\"]]"
 
 #. type: Content of: <div><div><div><div>
 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-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\" "
-"alt=\"Computadora reiniciada en memoria USB a la derecha\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computadora reiniciada en memoria USB a la derecha\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -189,8 +193,8 @@ msgstr "Reiniciar"
 #| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 #| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
 "\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
@@ -200,8 +204,12 @@ msgid "Install"
 msgstr "Instalar"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
+#| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
@@ -217,28 +225,32 @@ 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-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-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-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">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-usb\">Instalar</span> <span "
-"class=\"upgrade\">Actualizar</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Instalar</"
+"span> <span class=\"upgrade\">Actualizar</span>"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
+#| "\"Encryption configured on USB stick on the right\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Cifrado configurado en una memoria USB a la derecha\"]]"
@@ -270,13 +282,13 @@ msgstr "Configurar"
 #~ msgid ""
 #~ "<span class=\"windows linux mac-usb 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-usb 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=\"\"]]"
@@ -311,16 +323,16 @@ msgstr "Configurar"
 #~ "First you will <span class=\"windows linux mac-usb\">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-usb\">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-usb upgrade-tails\"><small>[[!toggle id="
@@ -339,17 +351,17 @@ msgstr "Configurar"
 #~ msgid ""
 #~ "Then you will <span class=\"windows linux mac-usb\">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-usb\">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 46497e9c41b7e884f4a49098f951ae311cd70f71..fc049d3d53782229a72e1ecd5e224db55ec4d18d 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb 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>
@@ -121,7 +121,7 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 
@@ -132,13 +132,13 @@ msgstr ""
 #. type: Content of: <div><div><div><div>
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" "
-"alt=\"Computer restarted on USB stick on the left\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Computer restarted on USB stick on the left\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -147,8 +147,8 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -157,7 +157,7 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 
@@ -171,8 +171,8 @@ msgstr ""
 
 #. type: Content of: <div><div><div><div>
 msgid ""
-"[[!img install/inc/infography/clone-tails.png link=\"no\" alt="
-"\"Tails installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/clone-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
@@ -184,7 +184,7 @@ msgstr ""
 #. type: Content of: <div><div><div><div>
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index 2131d33286bbcc1aac24c8624f8d1d8566b22bf4..7247eefe3bfb80cf9289acba37d0bf029300de0b 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb\">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-usb 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-usb\">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
@@ -146,8 +146,12 @@ msgid "Your steps"
 msgstr "Votre marche à suivre"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+#| "\"ISO image downloaded and verified\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
@@ -164,18 +168,18 @@ msgstr "Téléchargement"
 #| "\"ISO image downloaded and verified\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
 "\"Image ISO téléchargée et vérifiée\"]]"
 
 #. type: Content of: <div><div><div><div>
 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-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\" "
-"alt=\"Ordinateur redémarré sur la clé USB de gauche\"]]"
+"[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" alt="
+"\"Ordinateur redémarré sur la clé USB de gauche\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -187,8 +191,8 @@ msgstr "Redémarrage"
 #| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 #| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
 "\"Image ISO installée sur la clé USB de gauche\"]]"
@@ -198,8 +202,12 @@ msgid "Install"
 msgstr "Installation"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
+#| "\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
@@ -215,28 +223,32 @@ 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-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-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-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">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-usb\">Installation</span> "
-"<span class=\"upgrade\">Mise à jour</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Installation</"
+"span> <span class=\"upgrade\">Mise à jour</span>"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
+#| "\"Encryption configured on USB stick on the right\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
 "\"Chiffrement configuré sur la clé USB de droite\"]]"
@@ -287,17 +299,17 @@ msgstr "Configuration"
 #~ "First you will <span class=\"windows linux mac-usb\">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-usb\">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-usb upgrade-tails\"><small>[[!toggle id="
@@ -316,28 +328,28 @@ msgstr "Configuration"
 #~ msgid ""
 #~ "Then you will <span class=\"windows linux mac-usb\">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-usb\">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-usb 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-usb 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-usb\"><small>1 hour to install</"
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index 1e0bf067801e6151b5ed7f55707eda62cf49b794..d76c2b75d3a74f9e577d4f13f28eb2b4251b538d 100644
--- a/wiki/src/install/inc/overview.it.po
+++ b/wiki/src/install/inc/overview.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">Install</"
+#| "span> <span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "<span class=\"windows linux mac-usb 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-usb\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Installa</"
+"span> <span class=\"upgrade\">Aggiorna</span>"
 
 #. type: Content of: <div><div><div><div><div><h4><span>
 msgid ""
@@ -49,15 +49,15 @@ msgstr ""
 #. type: Content of: <div><div><div><div><div><h4>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">Install</"
+#| "span> <span class=\"upgrade\">Upgrade</span>"
 msgid ""
 "</span> <span class=\"windows linux mac-usb 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-usb\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Installa</"
+"span> <span class=\"upgrade\">Aggiorna</span>"
 
 #. type: Content of: <div><div><div><div>
 msgid "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
@@ -67,8 +67,8 @@ msgstr "[[!img install/inc/icons/usb.png link=\"no\" alt=\"\"]]"
 msgid "Your Tails"
 msgstr ""
 "<span class=\"windows linux mac-usb\">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\"]]"
@@ -134,10 +134,15 @@ msgid "Your steps"
 msgstr "La procedura"
 
 #. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr ""
+"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Download"
@@ -150,16 +155,15 @@ msgstr "Scarica"
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 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-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\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -171,8 +175,8 @@ msgstr "Riavvia"
 #| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
 
@@ -186,7 +190,7 @@ msgstr "Installa"
 #| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
 #| "alt=\"ISO image installed on USB stick on the left\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr ""
 "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
@@ -201,28 +205,31 @@ 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-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
+msgstr "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">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-usb\">Installa</span> <span "
-"class=\"upgrade\">Aggiorna</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">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 on the right\"]]"
-msgstr ""
+"\"Encryption configured on USB stick\"]]"
+msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Configure"
@@ -242,16 +249,16 @@ msgstr "Configura"
 #~| "First you will <span class=\"windows linux mac-usb\">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-usb\">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-usb\">installare "
 #~ "una Tails, che farà da intermediazione, sulla prima chiavetta USB.</span> "
@@ -265,15 +272,15 @@ msgstr "Configura"
 #~ msgid ""
 #~ "Then you will <span class=\"windows linux mac-usb\">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-usb\">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 174f2a92f43603fd20d497f5ecc28d278a2ba05f..8dfed9ab5f9ee4857ca9de5c7d02b411e4a9fc7a 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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-usb\">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-usb 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-usb\">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
@@ -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=\"ISO "
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"USB "
 "image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
@@ -173,19 +173,17 @@ msgstr ""
 #| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/download-and-verify-in-tails.png link=\"no\" "
-"alt=\"ISO image downloaded and verified\"]]"
+"alt=\"USB image downloaded and verified\"]]"
 msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid ""
-#| "[[!img install/inc/infography/restart-on-other-tails.png link=\"no"
-#| "\"]]"
+#| "[[!img install/inc/infography/restart-on-other-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-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\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 msgid "Restart"
@@ -195,8 +193,8 @@ msgstr "Reinicie"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
-"installed on USB stick on the right\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image "
+"installed on USB stick\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -207,7 +205,7 @@ msgstr "Instale"
 #, fuzzy
 #| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 msgid ""
-"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"USB "
 "image installed on USB stick on the left\"]]"
 msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
 
@@ -223,32 +221,30 @@ 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-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-tails.png link=\"no\" alt=\"Tails "
+"installed on USB stick on the right\"]]"
+msgstr "[[!img install/inc/infography/clone-tails.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
 #, fuzzy
 #| msgid ""
-#| "<span class=\"install-clone mac-clone windows linux mac-usb\">Install</span> <span "
-#| "class=\"upgrade\">Upgrade</span>"
+#| "<span class=\"install-clone mac-clone windows linux mac-usb\">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-usb\">Instale</span> <span "
-"class=\"upgrade\">Atualize</span>"
+"<span class=\"install-clone mac-clone windows linux mac-usb\">Instale</span> "
+"<span class=\"upgrade\">Atualize</span>"
 
 #. type: Content of: <div><div><div><div>
 #, fuzzy
 #| msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 msgid ""
 "[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
-"\"Encryption configured on USB stick on the right\"]]"
+"\"Encryption configured on USB stick\"]]"
 msgstr "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
 
 #. type: Content of: <div><div><div><div><p>
@@ -288,16 +284,16 @@ msgstr ""
 #~| "First you will <span class=\"windows linux mac-usb\">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-usb\">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-usb\">instalar um Tails "
 #~ "intermediário na primeira memória USB.</span> <span class=\"\">gravar um "
@@ -332,32 +328,32 @@ msgstr ""
 #~ msgid ""
 #~ "Then you will <span class=\"windows linux mac-usb\">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-usb\">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-usb\">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-usb 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-usb\">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/create_persistence.inline.de.po b/wiki/src/install/inc/steps/create_persistence.inline.de.po
index d92c9dcd15609b20c95ba2e279d0791342cf20b9..559b3c5a7f919a8332e50be57c02aaccf46209a8 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.de.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2016-05-09 11:23-0000\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -24,7 +24,7 @@ msgstr "<div class=\"trophy\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "<p>Yeah, you are done installing Tails!</p>\n"
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr "<p>Super, Sie haben die Installation von Tails abgeschlossen!</p>\n"
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.es.po b/wiki/src/install/inc/steps/create_persistence.inline.es.po
index 67ea4d090b4c1cce2490006a6f03efe88f08e5e1..5818346b539b67aa445566fbde4d53cae5cd410e 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.es.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2018-02-21 07:34+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -25,7 +25,7 @@ msgstr "<div class=\"trophy\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "<p>Yay, you are done installing Tails!</p>\n"
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr "<p>Viva, ¡finalizaste la instalación de Tails!</p>\n"
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fa.po b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
index da35098a44695bd1f65b64cd164a652384269325..de9f59763b77934296eec8adb8ea2777650fd9a9 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fa.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.fr.po b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
index 56a84b40ffe3347f6e02aa0bdbcb823d34a3ebc7..4030568170ae58ca334460e1f3a5292fca947007 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.fr.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2018-01-26 12:49+0000\n"
 "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -24,7 +24,7 @@ msgstr "<div class=\"trophy\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "<p>Yay, you are done installing Tails!</p>\n"
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr "<p>Super ! Vous avez fini d'installer Tails !</p>\n"
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.it.po b/wiki/src/install/inc/steps/create_persistence.inline.it.po
index d754f9b34afdb7ee767c83d6e255ac35afa7ede8..4e241bfdfae46160422325f6ba3c8bcc2b471643 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.it.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2016-09-02 14:09+0200\n"
 "Last-Translator: anoni\n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -24,7 +24,7 @@ msgstr "<div class=\"trophy\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "<p>Yeah, you are done installing Tails!</p>\n"
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr "<p>Yeah, sei arrivata in fondo all'installazione di Tails!</p>\n"
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.pt.po b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
index f418f076ff13aacbb0d22afa463fbd0cb9a6fa6f..ed23121a5a4e484142fb6bd58fdd83ae59fa595c 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.pt.po
+++ b/wiki/src/install/inc/steps/create_persistence.inline.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-11-11 17:55+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2016-04-30 12:43-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -25,7 +25,7 @@ msgstr "<div class=\"trophy\">\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "<p>Yeah, you are done installing Tails!</p>\n"
-msgid "<p>Yay, you managed to start <span class=\"clone\">your new</span> Tails on your computer!</p>\n"
+msgid "<p>Yay, you managed to start <span class=\"install-clone mac-clone\">your new</span> Tails on your computer!</p>\n"
 msgstr "<p>Eba! Você terminou de instalar o Tails!</p>\n"
 
 #. type: Plain text
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.de.po b/wiki/src/install/inc/steps/install_with_etcher.inline.de.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.de.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.es.po b/wiki/src/install/inc/steps/install_with_etcher.inline.es.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.es.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.fa.po b/wiki/src/install/inc/steps/install_with_etcher.inline.fa.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.fr.po b/wiki/src/install/inc/steps/install_with_etcher.inline.fr.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.it.po b/wiki/src/install/inc/steps/install_with_etcher.inline.it.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.it.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_etcher.inline.pt.po b/wiki/src/install/inc/steps/install_with_etcher.inline.pt.po
index 0172c31f27e10ae9601d67ec025dd53c4f88bd6c..087ebb70f501aa21b4daec3b76fe25e5e9b5164f 100644
--- a/wiki/src/install/inc/steps/install_with_etcher.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_with_etcher.inline.pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png "
-"link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/plug-usb.png link=\"no\" alt=\"USB stick plugged in the computer\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -29,16 +27,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
 "<p class=\"mac\"> Open <span class=\"application\">Finder</span> and choose "
-"<span class=\"application\">Etcher</span> in <span "
-"class=\"guilabel\">Applications</span>.  </p>"
+"<span class=\"application\">Etcher</span> in <span class=\"guilabel"
+"\">Applications</span>.  </p>"
 msgstr ""
 
 #. type: Plain text
@@ -63,16 +59,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_mac.png class=\"mac\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" "
-"link=\"no\" alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/etcher_in_windows.png class=\"windows\" link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -92,9 +84,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png "
-"link=\"no\" alt=\"\"]]</div>\n"
+msgid "   <div class=\"step-image\">[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"USB image installed on USB stick\"]]</div>\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -114,8 +104,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   After installing Tails, <span class=\"application\">Etcher</span> "
-"verifies the\n"
+"   After installing Tails, <span class=\"application\">Etcher</span> verifies the\n"
 "   installation.\n"
 msgstr ""
 
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po
index 76e71c09c3a61428310bd3f0e9a97b624e5ef7cf..9bca4736133ea001275aa4ed252daf2e0aa21671 100644
--- a/wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-11-07 15:43+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "   <div class=\"linux\">\n"
-"     For example, you can press the <span class=\"keycap\">Super</span> "
-"key,\n"
+"     For example, you can press the <span class=\"keycap\">Super</span> key,\n"
 "     then type <span class=\"command\">disks</span>, then type\n"
 "     <span class=\"keycap\">Enter</span>.\n"
 "   </div>\n"
@@ -51,16 +50,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" "
-"alt=\"USB stick plugged in the computer\"]]\n"
+msgid "     [[!img install/inc/infography/plug-usb.png link=\"no\" class=\"linux\" alt=\"USB stick plugged in the computer\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB stick plugged on the left\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -76,9 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   <div class=\"caution\"><p>All the data on this USB stick will be "
-"lost.</p></div>\n"
+msgid "   <div class=\"caution\"><p>All the data on this USB stick will be lost.</p></div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -88,37 +81,29 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-tails.png link=\"no\" "
-"class=\"linux\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-tails.png link=\"no\" class=\"linux\" alt=\"USB image installed on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" "
-"class=\"upgrade\" alt=\"\"]]\n"
+msgid "     [[!img install/inc/infography/install-upgrade-usb.png link=\"no\" class=\"upgrade\" alt=\"USB image installed on USB stick on the left\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
 msgid ""
-"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] button in the titlebar and choose <span "
-"class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
+"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
+"\"no\"]] button in the titlebar and choose <span class=\"guimenuitem"
+"\">Restore Disk Image&hellip;</span>."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -130,9 +115,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
-"link=\"no\"]]\n"
+msgid "   [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -152,16 +135,13 @@ msgstr ""
 msgid ""
 "   <!-- Note for technical writers:\n"
 "\tThe gear menu seems to have been replaced by the hamburger menu\n"
-"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu "
-"Xenial (16.04).\n"
+"        in 3.14, see GNOME#732980. That's Debian Stretch (9) and Ubuntu Xenial (16.04).\n"
 "        Let's wait until Buster is out before removing this clause. -->\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
-"alt=\"\"]]\n"
+msgid "   [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
 msgstr ""
 
 #. type: Bullet: '1. '
@@ -172,7 +152,8 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '1. '
-msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid ""
+"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
 msgstr ""
 
 #. type: Bullet: '1. '
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 aaadb3da4d466d0eac4a463bd881ebbb21045e0c..20621028226bc8afc950ab30cdb594c54493e68c 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2017-02-09 20:59+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -182,7 +182,7 @@ msgstr "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upg
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
 
 #. type: Plain text
@@ -261,7 +261,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."
 
@@ -340,786 +340,837 @@ 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 ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   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 ""
-"   Fehlerbehebung\n"
-"   ---------------\n"
+"   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 "   [[!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 ""
+"   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
-#, fuzzy, no-wrap
-#| msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schwarzer Bildschirm mit Tails-Hintergrund. 'Boot-Menü' mit den Optionen 'Live' und 'Live (failsafe)'.\"]]\n"
+#, no-wrap
+msgid "   ### Getting to the boot menu\n"
+msgstr "   ### In das Boot-Menü gelangen\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-#| "   be impossible to start Tails on your Mac model.</p>\n"
-#| "   </div>\n"
+#, no-wrap
 msgid ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
+"   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 ""
-"   <p>Wenn Ihr Computer beim Starten von der Tails-DVD fehlschlägt, ist es möglicherweise derzeit\n"
-"   unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
-"   </div>\n"
+"   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: Bullet: '1. '
-msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
+#. 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 ""
-"Nach 30&ndash;60 Sekunden erscheint eine andere Bildschirmansicht, die <span "
-"class=\"application\">Tails Greeter</span> genannt wird."
+"Stellen Sie sicher, dass der USB-Stick an dem Computer angeschlossen ist."
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
+"   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
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   <div class=\"note\">\n"
-#| "   <p>If the computer stops responding or displays error messages before\n"
-#| "   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-#| "   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-#| "   Tails not starting entirely\"]].</p>\n"
-#| "   </div>\n"
+#, no-wrap
 msgid ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
+"      <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 ""
-"   <div class=\"note\">\n"
-"   <p>Wenn Ihr Computer nicht mehr reagiert oder Fehlermeldungen anzeigt,\n"
-"   bevor Sie zum <span class=\"application\">Tails Greeter</span> gelangen, lesen Sie\n"
-"   [[!toggle id=\"not_entirely\" text=\"den Abschnitt über Fehlerbehebung wenn\n"
-"   Tails nicht vollständig startet\"]].</p>\n"
-"   </div>\n"
+"      <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 "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+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 "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
+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 ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
+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 ""
-"   Tails startet nicht vollständig\n"
-"   -----------------------------\n"
+"Drücken und halten Sie die von Ihnen in Schritt 3 ermittelte mögliche Taste "
+"für das Boot-Menü."
 
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
-#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+#. type: Bullet: '         1. '
 msgid ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
 msgstr ""
-"   Der folgende Abschnitt trifft zu, wenn das Menü <span class=\"guilabel\">Boot Tails</span>, aber nicht\n"
-"   der <span class=\"application\">Tails Greeter</span> beim Start von Tails erscheint.\n"
-
-#. type: Bullet: '   1. '
-msgid "Restart the computer on the first USB stick."
-msgstr "Starten Sie den Computer mit dem ersten USB-Stick neu."
+"Schalten Sie den Computer wieder ein, währenddessen Sie die mögliche Taste "
+"für das Boot-Menü gedrückt halten."
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, choose the <span class=\"guilabel\">failsafe</span>\n"
-#| "   mode which might work better on some computers.\n"
+#, no-wrap
 msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
+"            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 ""
-"   1. Wählen Sie im Menü <span class=\"guilabel\">Boot Tails</span> die Option\n"
-"   <span class=\"guilabel\">failsafe</span> aus, welche auf manchen Computern besser\n"
-"   funktionieren kann.\n"
+"            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
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. If the <span class=\"guilabel\">failsafe</span> mode does not work\n"
-#| "   better, restart the computer again on the first USB stick.\n"
+#, no-wrap
 msgid ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
+"            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 ""
-"   1. Wenn der <span class=\"guilabel\">failsafe</span>-Modus nicht besser funktioniert,\n"
-"   starten Sie den Computer erneut mit dem ersten USB-Stick neu.\n"
+"            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
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, press\n"
-#| "   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-#| "   of boot options appears at the bottom of the screen.\n"
+#, no-wrap
 msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
+"   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 ""
-"   1. Drücken Sie im Menü <span class=\"guilabel\">Boot Tails</span> die Taste\n"
-"   <span class=\"keycap\">TAB</span>. Eine Kommandozeile mit einer Liste von\n"
-"   Startoptionen erscheint am unteren Rand des Bildschirms.\n"
+"   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
-#, fuzzy, no-wrap
-#| msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\"]]\n"
-msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\"]]\n"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
-msgstr ""
-"Drücken Sie mehrmals die <span class=\"keycap\">Backspace</span>-Taste, um "
-"die Option <span class=\"code\">quiet</span> von der Kommandozeile zu "
-"entfernen."
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr "   ### Überprüfen Sie unsere Liste der bekannten Probleme\n"
 
-#. type: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
+"   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: Bullet: '   1. '
-msgid "Type `debug nosplash` to add these options to the command line."
-msgstr ""
-"Geben Sie `debug nosplash` ein, um diese Optionen zur Kommandozeile "
-"hinzuzufügen."
+#. type: Plain text
+#, no-wrap
+msgid "   ### Edit the BIOS settings\n"
+msgstr "   ### Bearbeiten Sie die BIOS-Einstellungen\n"
 
-#. type: Bullet: '   1. '
-msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
-msgstr ""
-"Drücken Sie <span class=\"keycap\">Enter</span>, um Tails neu zu starten."
-
-#. type: Bullet: '   1. '
-msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
-msgstr ""
-"Hoffentlich erscheinen jetzt beim Start von Tails Fehlermeldungen. Sie "
-"können [[diese an unser Support-Team senden|support/talk]], zum Beispiel "
-"indem Sie ein Foto von dem letzten Bildschirm und den Fehlermeldungen machen."
+#. 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: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
+"   <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 ""
-"Wenn die Fehlermeldung <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> gefolgt von <span class=\"code\">(initramfs)</"
-"span> ist, versuchen Sie die Option <span class=\"code\">live-"
-"media=removable</span> von der Boot-Kommandozeile zu entfernen."
+"   <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 ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
+"   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 ""
-"      Wenn das Entfernen von <span class=\"code\">live-media=removable</span> Ihnen den Start von\n"
-"      Tails ermöglicht, berichten Sie bitte den Fehler unserem [[Support-Team|support/talk]].\n"
-"      Dies trägt zur Verbesserung unserer\n"
-"      [[Liste der problematischen USB-Sticks|support/known_issues#problematic-usb-sticks]] bei.\n"
-"      Versuchen Sie anschließend Tails auf einem anderen USB-Stick zu installieren.\n"
+"   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>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\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>Das Entfernen der Option <span class=\"code\">live-media=removable</span> könnte\n"
-"   gefährlich sein. Wenn ein Angreifer Zugriff auf den Rechner hatte und ein\n"
-"   bösartiges Tails auf die interne Festplatte installiert hat, wird der Rechner\n"
-"   möglicherweise von dem bösartigen Tails anstatt vom USB-Stick starten.</p>\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
-#, fuzzy, no-wrap
-#| msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
-msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
-#| "list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
+#, no-wrap
 msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
+"   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. Wählen Sie Ihre bevorzugte Sprache in der Dropdown-Liste im linken unteren Bildschirmbereich\n"
-"im <span class=\"application\">Tails Greeter</span> aus. Klicken Sie auf <span class=\"button\">Anmelden</span>.\n"
+"   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 "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr "Nach 15&ndash;30 Sekunden erscheint der Tails Desktop."
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr "Deaktiveren Sie **Fast boot**."
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
-msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
-
-#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\"]]\n"
-
-#~ msgid "   [[!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"
-
-#, fuzzy
-#~| msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
-#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-#~ "   disks appears.</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Wahl</span>-Taste (<span class=\"keycap\">Alt</span>-Taste), bis eine Liste der möglichen Datenträger\n"
-#~ "   erscheint, von denen gestartet werden kann.</p>\n"
-
-#, fuzzy
-#~| msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
-#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
-#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Enter</span>. Die DVD\n"
-#~ "   wird möglicherweise, wie im folgenden Bildschirmfoto, als <span class=\"guilabel\">Windows</span> bezeichnet:</p>\n"
-
-#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Bildschirm mit dem Logo einer internen mit 'Macintosh HD' bezeichneten Festplatte und einer mit 'Windows' bezeichnete DVD (ausgewählt)\"]]\n"
-
-#~ msgid ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
-#~ "   try these other two methods:</p>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>Wenn Ihr Computer das vorübergehende Tails nicht startet, können Sie\n"
-#~ "   diese zwei anderen Vorgehensweisen versuchen:</p>\n"
-
-#~ msgid ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/dvd]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-#~ msgstr ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Installation von einem anderen Betriebssystem aus|install]]</li>\n"
-#~ "     <li class=\"mac-usb mac-clone\">[[Eine DVD brennen und anschließend installieren|mac/dvd]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Von der Kommandozeile aus installieren|mac/usb]]</li>\n"
-#~ "   </ul>\n"
+#, 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"
 
-#~ msgid ""
-#~ "   <p>If you tried them already but failed as well, then it might\n"
-#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <p>Wenn Sie diese bereits versucht haben und dabei gescheitert sind, ist\n"
-#~ "   es derzeit möglicherweise unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
-#~ "   </div>\n"
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr "Aktivieren Sie den **Legacy mode**"
 
-#~ msgid ""
-#~ "<p class=\"usb\">The most difficult part is over!\n"
-#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">Der schwierigste Teil ist geschafft!\n"
-#~ "Holen Sie nun Ihren zweiten USB-Stick, da es an der Zeit ist, das eigentliche Tails darauf zu installieren.</p>\n"
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
 
-#~ msgid ""
-#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
-#~ "you to store some of your documents and configuration\n"
-#~ "and benefit from automatic security upgrades.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">Es ist wichtig, das endgültige Tails zu installieren, da\n"
-#~ "Sie dadurch Ihre Dokumente und Konfigurationen speichern\n"
-#~ "und von automatischen Sicherheitsaktualisierungen profitieren können.</p>\n"
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr "Aktivieren Sie **CSM boot**"
 
-#, fuzzy
-#~| 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="
-#~ "\"install-clone mac-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"
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr "Deaktivieren Sie **UEFI**"
 
-#~ msgid ""
-#~ "   [[!inline pages=\"install/inc/steps/not_entirely.inline\" raw=\"yes"
-#~ "\"]]\n"
-#~ msgstr ""
-#~ "   [[!inline pages=\"install/inc/steps/not_entirely.inline.de\" raw=\"yes"
-#~ "\"]]\n"
+#. 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 ""
-"   Tails does not start at all\n"
-"   ---------------------------\n"
-msgstr ""
-"   Tails startet gar nicht\n"
-"   ---------------------- \n"
+msgid "   ### Report the problem to our support team\n"
+msgstr "   ### Berichten Sie das Problem unserem Support-Team\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"
+"   <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 ""
-"   Der folgende Abschnitt trifft zu, wenn von einem USB-Stick gestartet wird und das\n"
-"   <span class=\"guilabel\">Boot-Menü</span> nicht erscheint.\n"
+"   <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 ""
-"   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"
+"   Please, [[send an email to our support team|support/talk]], including\n"
+"   the following information:\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"
+"   [[Senden Sie bitte eine E-Mail an unser Support-Team|support/talk]], die\n"
+"   folgende Informationen enthält:\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ### In das Boot-Menü gelangen\n"
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr "Welche Version von Tails versuchen Sie zu starten?"
 
-#. type: Plain text
-#, no-wrap
+#. 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 ""
-"   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"
+"What exactly happens when trying to start? Report the complete error message "
+"that appears on the screen, if any."
 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"
+"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 "Shut down the computer."
-msgstr "Fahren Sie den Computer herunter."
+#. 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 "Make sure that the first USB stick is plugged in the computer."
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
 msgstr ""
-"Stellen Sie sicher, dass der USB-Stick an dem Computer angeschlossen ist."
+"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?"
 
 #. 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 ""
-"   1. Identify the potential boot menu keys for the computer depending on\n"
-"   the computer manufacturer in the following list:\n"
+"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 ""
-"   1. Ermitteln Sie, abhängig vom Computerhersteller, in der folgenden Liste\n"
-"   die möglichen Tasten für das Boot-Menü des Computers:\n"
+"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: 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"
+#. type: Bullet: '   1. '
+msgid "Does the same USB stick or DVD start successfully on other computers?"
 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"
+"Startet der gleiche USB-Stick oder die gleiche DVD erfolgreich auf einem "
+"anderen Computer?"
 
 #. 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"
+#, fuzzy, no-wrap
+#| msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schwarzer Bildschirm mit Tails-Hintergrund. 'Boot-Menü' mit den Optionen 'Live' und 'Live (failsafe)'.\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
 msgid ""
-"      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."
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
 msgstr ""
-"Drücken und halten Sie die von Ihnen in Schritt 3 ermittelte mögliche Taste "
-"für das Boot-Menü."
+"   <p>Wenn Ihr Computer beim Starten von der Tails-DVD fehlschlägt, ist es möglicherweise derzeit\n"
+"   unmöglich, Tails auf Ihrem Mac Modell zu starten.</p>\n"
+"   </div>\n"
 
-#. type: Bullet: '         1. '
+#. type: Bullet: '1. '
 msgid ""
-"Switch on the computer again while holding the potential boot menu key "
-"pressed."
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
 msgstr ""
-"Schalten Sie den Computer wieder ein, währenddessen Sie die mögliche Taste "
-"für das Boot-Menü gedrückt halten."
+"Nach 30&ndash;60 Sekunden erscheint eine andere Bildschirmansicht, die <span "
+"class=\"application\">Tails Greeter</span> genannt wird."
 
 #. 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"
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\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
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <div class=\"note\">\n"
+#| "   <p>If the computer stops responding or displays error messages before\n"
+#| "   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+#| "   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+#| "   Tails not starting entirely\"]].</p>\n"
+#| "   </div>\n"
 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"
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\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"
+"   <div class=\"note\">\n"
+"   <p>Wenn Ihr Computer nicht mehr reagiert oder Fehlermeldungen anzeigt,\n"
+"   bevor Sie zum <span class=\"application\">Tails Greeter</span> gelangen, lesen Sie\n"
+"   [[!toggle id=\"not_entirely\" text=\"den Abschnitt über Fehlerbehebung wenn\n"
+"   Tails nicht vollständig startet\"]].</p>\n"
+"   </div>\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"
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Überprüfen Sie unsere Liste der bekannten Probleme\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 ""
-"   Similar problems might have been reported already for your model of computer\n"
-"   in our [[list of known issues|support/known_issues]].\n"
+"   Troubleshooting\n"
+"   ---------------\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"
+"   Fehlerbehebung\n"
+"   ---------------\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   ### Edit the BIOS settings\n"
-msgstr "   ### Bearbeiten Sie die BIOS-Einstellungen\n"
+msgid ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+"   Tails startet nicht vollständig\n"
+"   -----------------------------\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"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+"   Der folgende Abschnitt trifft zu, wenn das Menü <span class=\"guilabel\">Boot Tails</span>, aber nicht\n"
+"   der <span class=\"application\">Tails Greeter</span> beim Start von Tails erscheint.\n"
+
+#. type: Bullet: '   1. '
+msgid "Restart the computer on the first USB stick."
+msgstr "Starten Sie den Computer mit dem ersten USB-Stick neu."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, choose the <span class=\"guilabel\">failsafe</span>\n"
+#| "   mode which might work better on some computers.\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"
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\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"
+"   1. Wählen Sie im Menü <span class=\"guilabel\">Boot Tails</span> die Option\n"
+"   <span class=\"guilabel\">failsafe</span> aus, welche auf manchen Computern besser\n"
+"   funktionieren kann.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. If the <span class=\"guilabel\">failsafe</span> mode does not work\n"
+#| "   better, restart the computer again on the first USB stick.\n"
 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"
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\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"
+"   1. Wenn der <span class=\"guilabel\">failsafe</span>-Modus nicht besser funktioniert,\n"
+"   starten Sie den Computer erneut mit dem ersten USB-Stick neu.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, press\n"
+#| "   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+#| "   of boot options appears at the bottom of the screen.\n"
 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"
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\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"
+"   1. Drücken Sie im Menü <span class=\"guilabel\">Boot Tails</span> die Taste\n"
+"   <span class=\"keycap\">TAB</span>. Eine Kommandozeile mit einer Liste von\n"
+"   Startoptionen erscheint am unteren Rand des Bildschirms.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\"]]\n"
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
+msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\"]]\n"
+
+#. type: Bullet: '   1. '
 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"
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
 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"
+"Drücken Sie mehrmals die <span class=\"keycap\">Backspace</span>-Taste, um "
+"die Option <span class=\"code\">quiet</span> von der Kommandozeile zu "
+"entfernen."
 
 #. 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"
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
 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))"
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
 msgstr ""
+"Geben Sie `debug nosplash` ein, um diese Optionen zur Kommandozeile "
+"hinzuzufügen."
 
-#. type: Bullet: '      - '
-msgid "Enable **CSM boot**"
-msgstr "Aktivieren Sie **CSM boot**"
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr ""
+"Drücken Sie <span class=\"keycap\">Enter</span>, um Tails neu zu starten."
 
-#. type: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Deaktivieren Sie **UEFI**"
+#. type: Bullet: '   1. '
+msgid ""
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
+msgstr ""
+"Hoffentlich erscheinen jetzt beim Start von Tails Fehlermeldungen. Sie "
+"können [[diese an unser Support-Team senden|support/talk]], zum Beispiel "
+"indem Sie ein Foto von dem letzten Bildschirm und den Fehlermeldungen machen."
 
 #. type: Bullet: '   1. '
 msgid ""
-"Try to upgrade the BIOS to the latest version provided by the manufacturer."
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
 msgstr ""
-"Versuchen Sie, das BIOS auf die neueste vom Hersteller angebotene Version zu "
-"aktualisieren."
+"Wenn die Fehlermeldung <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> gefolgt von <span class=\"code\">(initramfs)</"
+"span> ist, versuchen Sie die Option <span class=\"code\">live-"
+"media=removable</span> von der Boot-Kommandozeile zu entfernen."
 
 #. type: Plain text
 #, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   ### Berichten Sie das Problem unserem Support-Team\n"
+msgid ""
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\n"
+msgstr ""
+"      Wenn das Entfernen von <span class=\"code\">live-media=removable</span> Ihnen den Start von\n"
+"      Tails ermöglicht, berichten Sie bitte den Fehler unserem [[Support-Team|support/talk]].\n"
+"      Dies trägt zur Verbesserung unserer\n"
+"      [[Liste der problematischen USB-Sticks|support/known_issues#problematic-usb-sticks]] bei.\n"
+"      Versuchen Sie anschließend Tails auf einem anderen USB-Stick zu installieren.\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 class=\"caution\">\n"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</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 class=\"caution\">\n"
+"   <p>Das Entfernen der Option <span class=\"code\">live-media=removable</span> könnte\n"
+"   gefährlich sein. Wenn ein Angreifer Zugriff auf den Rechner hatte und ein\n"
+"   bösartiges Tails auf die interne Festplatte installiert hat, wird der Rechner\n"
+"   möglicherweise von dem bösartigen Tails anstatt vom USB-Stick starten.</p>\n"
 "   </div>\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
+#| "list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
 msgid ""
-"   Please, [[send an email to our support team|support/talk]], including\n"
-"   the following information:\n"
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
 msgstr ""
-"   [[Senden Sie bitte eine E-Mail an unser Support-Team|support/talk]], die\n"
-"   folgende Informationen enthält:\n"
+"1. Wählen Sie Ihre bevorzugte Sprache in der Dropdown-Liste im linken unteren Bildschirmbereich\n"
+"im <span class=\"application\">Tails Greeter</span> aus. Klicken Sie auf <span class=\"button\">Anmelden</span>.\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 "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr "Nach 15&ndash;30 Sekunden erscheint der Tails Desktop."
 
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "Wie haben Sie das ISO-Image verifiziert?"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
+msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "Von welchem Hersteller und welches Modell ist der 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: 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."
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\"]]\n"
 
-#. type: 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?"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
-msgstr ""
-"Welches Programm haben Sie zur Installation benutzt, wenn Sie versuchen, "
-"Tails von einem USB-Stick zu starten:"
+#, 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"
 
-#. type: Bullet: '      - '
 #, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
+#~| 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"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</"
+#~ "span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Wahl</span>-Taste (<span class=\"keycap\">Alt</"
+#~ "span>-Taste), bis eine Liste der möglichen Datenträger\n"
+#~ "   erscheint, von denen gestartet werden kann.</p>\n"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "<span class=\"application\">Tails Installer</span> oder"
+#, 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"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "<span class=\"command\">dd</span> auf der Kommandozeile?"
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the "
+#~ "following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Enter</span>. Die DVD\n"
+#~ "   wird möglicherweise, wie im folgenden Bildschirmfoto, als <span class="
+#~ "\"guilabel\">Windows</span> bezeichnet:</p>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Bitte beachten Sie, dass dies die einzigen unterstützten Installationsmethoden sind.\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"
 
-#. 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?"
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Wenn Ihr Computer das vorübergehende Tails nicht startet, können "
+#~ "Sie\n"
+#~ "   diese zwei anderen Vorgehensweisen versuchen:</p>\n"
 
-#. type: 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 ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-usb mac-clone\">[[Burn a DVD and then install|mac/"
+#~ "dvd]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installation von einem anderen "
+#~ "Betriebssystem aus|install]]</li>\n"
+#~ "     <li class=\"mac-usb mac-clone\">[[Eine DVD brennen und anschließend "
+#~ "installieren|mac/dvd]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Von der Kommandozeile aus installieren|mac/"
+#~ "usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Wenn Sie diese bereits versucht haben und dabei gescheitert sind, "
+#~ "ist\n"
+#~ "   es derzeit möglicherweise unmöglich, Tails auf Ihrem Mac Modell zu "
+#~ "starten.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails "
+#~ "on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Der schwierigste Teil ist geschafft!\n"
+#~ "Holen Sie nun Ihren zweiten USB-Stick, da es an der Zeit ist, das "
+#~ "eigentliche Tails darauf zu installieren.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Es ist wichtig, das endgültige Tails zu installieren, "
+#~ "da\n"
+#~ "Sie dadurch Ihre Dokumente und Konfigurationen speichern\n"
+#~ "und von automatischen Sicherheitsaktualisierungen profitieren können.</"
+#~ "p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!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="
+#~ "\"install-clone mac-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 ""
+#~ "   [[!inline pages=\"install/inc/steps/not_entirely.inline\" raw=\"yes"
+#~ "\"]]\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>,"
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 9f5b82da2298268a0a9355a2f05f92680f22e308..afae1ac5bb2874a1fa9141305653adb9316b5e37 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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/"
@@ -183,7 +183,7 @@ msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"c
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
 
 #. type: Plain text
@@ -262,7 +262,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."
 
@@ -336,511 +336,177 @@ 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
-#, no-wrap
-msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
-msgstr ""
-"   Resolución de problemas\n"
-"   -----------------------\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Pantalla negra con el logo de Tails. Menú de arranque con dos opciones 'Tails' y 'Tails (Modo seguro)'.\"]]\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
-#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-#| "   be impossible to start Tails on your Mac model.</p>\n"
-#| "   </div>\n"
-msgid ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-"   <p>Si tu computador no arranca desde el DVD Tails, tal vez sea imposible por ahora arrancar Tails desde tu modelo de Mac.</p>\n"
-"   </div>\n"
-
-#. type: Bullet: '1. '
+#| "   Tails does not start at all\n"
+#| "   ---------------------------\n"
 msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
 msgstr ""
-"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class="
-"\"application\">Tails Greeter</span>."
+"   Tails no arranca en absoluto\n"
+"   --------------------------------\n"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
+"   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 ""
-"   <div class=\"note\">\n"
-"   <p>Si la computadora muestra el mensaje de error\n"
-"   <span class=\"guilabel\">Error iniciando GDM con tu tarjeta\n"
-"   gráfica</span>, revisa nuestra [[lista de problemas conocidos con tarjetas\n"
-"   gráficas|support/known_issues/graphics]].</p>\n"
+"   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 ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
 msgstr ""
+"   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 "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
+msgid "   ### Getting to the boot menu\n"
+msgstr "   ### Cómo llegar al menú de arranque\n"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
+"   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 ""
-"   Tails no arranca completamente\n"
-"   ------------------------------\n"
+"   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 ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
-msgstr ""
-"   La siguiente sección aplica si el <span class=\"application\">Menú de cargador de arranque</span> aparece, pero no aparece el\n"
-"   <span class=\"application\">Tails Greeter</span> al arracar Tails.\n"
+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 "Restart the computer on the first USB stick."
-msgstr "Reinicia la computadora en el primer dispositivo USB."
+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. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
 msgstr ""
-"   1. En el <span class=\"application\"> Menú del cargador de arranque</span>, escoge el\n"
-"   <span class=\"guilabel\">Troubleshooting Mode </span>\n"
-"   que puede funcionar mejor en algunos computadores.\n"
+"   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 ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
+"      <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 ""
-"   1. Si el <span class=\"guilabel\">Troubleshooting Mode</span> no funciona\n"
-"   mejor, reinicia el computador de nuevo desde la primera memoria USB.\n"
+"      <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 ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
-msgstr ""
-"   1. En el <span class=\"application\">Menú de cargador de arranque</span>, oprime\n"
-"   <span class=\"keycap\">TAB</span>. Una línea de comando con una lista\n"
-" de opciones de arranque aparecerá abajo de la pantalla.\n"
+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 "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Pantalla negra con el logo de Tails y una lista de opciones de arranque\"]]\n"
-
-#. type: Bullet: '   1. '
-msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
-msgstr ""
-"Oprime la tecla <span class=\"keycap\">Tecla de borrar</span>varias veces "
-"para quitar las <span class=\"code\">opciones  de la linea de comando que no "
-"apliquen</span>."
-
-#. type: Bullet: '   1. '
 msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
+"      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 ""
-"Si Tails falló previamente al iniciar y mostró el error <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para "
-"agregar esta opción a la línea de comandos."
+"      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: Bullet: '   1. '
-msgid "Type `debug nosplash` to add these options to the command line."
-msgstr ""
-"Escribe `debug nosplash` para agregar estas opciones a la línea de comandos."
+#. 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 "To start Tails, press <span class=\"keycap\">Enter</span>."
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
 msgstr ""
-"Para arrancar Tails oprime la tecla <span class=\"keycap\">Enter / de "
-"retorno</span>."
+"Presiona y mantén presionada la tecla potencial del menú de arranque "
+"identificada en el paso 3."
 
-#. type: Bullet: '   1. '
+#. type: Bullet: '         1. '
 msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
 msgstr ""
-"Mensajes de error deberían aparecer ahora al arrancar Tails. Puedes "
-"[[enviarlos a nuestro equipo de asistencia \n"
-"por correo |support/talk]], por ejemplo tomando una foto a la ultima "
-"pantalla y al mensaje de error."
+"Vuelve a encender la computadora mientras mantienes presionada la tecla de "
+"menú de arranque."
 
-#. type: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
+"            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 ""
-"si el mensaje de error es <span class=\"code\">/bin/sh: can't access tty; "
-"job control turned off</span> seguido de <span class=\"code\">(initramfs)</"
-"span>, puedes intentar quitar la opción <span class=\"code\">live-"
-"media=removable</span> de la línea de arranque."
+"            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 ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
+"            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 ""
-"      Si quitar <span class=\"code\">live-media=removable</span> te permite arrancar Tails, te agradeceríamos\n"
-"      que informes del problema a nuestro [[equipo de asistencia|support/talk]].\n"
-"      Eso nos permite mejorar la [[lista\n"
-"      de memorias USB problemáticas|support/known_issues#problematic-usb-sticks]].\n"
-"      Luego intenta instalar Tails con otra memoria USB.\n"
+"            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 ""
-"   <div class=\"caution\">\n"
-"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\n"
-"   </div>\n"
+"   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 ""
-"   <div class=\"caution\">\n"
-"   <p>Quitar la opción <span class=\"code\">live-media=removable</span>\n"
-"   puede ser peligroso. Si un adversario tiene acceso al computador e\n"
-"   instala un Tails malicioso sobre un disco duro interno, el computador\n"
-"   podría arracar desde el Tails malicioso en vez de la memoria USB.</p>\n"
-"   </div>\n"
+"   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 "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
-msgstr "1. En el <span class=\"application\">Tails Greeter</span> elige tu idioma y la configuración de tu teclado en la sección <span class=\"guilabel\">Language & Region</span> y presiona <span class=\"button\">Start Tails</span>.\n"
-
-#. type: Bullet: '1. '
-msgid "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr "Luego de 15&ndash;30 segundos, el escritorio de Tails aparecerá."
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
-msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"EscritorioTails\"]]\n"
-
-#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#~ msgid "   [[!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=\"Computadora reiniciada en la memoria USB en la derecha\"]]\n"
-
-#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computadora reiniciada en DVD\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-#~ "   disks appears.</p>\n"
-#~ msgstr "   <span class=\"keycap\">Opción</span> (<span class=\"keycap\">Alt</span> key) hasta que aparezca la lista de discos de arranque.</p>\n"
-
-#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Tecla 'opción' o 'alt' en la parte inferior izquierda del teclado de Mac\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
-#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Enter</span>. El DVD\n"
-#~ "   puede estar etiquetado como <span class=\"guilabel\">Windows</span> como en la siguiente captura de pantalla:</p>\n"
-
-#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Pantalla con el logo de un disco duro interno etiquetado 'Macintosh HD' y un DVD etiquetado 'Windows' (seleccionado)\"]]\n"
-
-#~ msgid ""
-#~ "   <div class=\"bug mac\">\n"
-#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
-#~ "   reinstalling an intermediary Tails from [[Windows using\n"
-#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac\">\n"
-#~ "   <p>Si solo aparece tu disco duro Macintosh, puedes intentar\n"
-#~ "   reinstalando un Tails intermedio desde [[Windows usando\n"
-#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-#~ "   </div>\n"
-
-#~ msgid ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
-#~ "   try these other two methods:</p>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>Si tu computadora falla al iniciar en el Tails intermedio, puedes\n"
-#~ "   intentar estos otros dos métodos:</p>\n"
-
-#~ msgid ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-#~ msgstr ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Instalar desde otro sistema operativo|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-
-#~ msgid ""
-#~ "   <p>If you tried them already but failed as well, then it might\n"
-#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <p>Si ya lo has intentado sin lograrlo, tal vez sea imposible arrancar Tails desde tu modelo de Mac.</p>\n"
-#~ "   </div>\n"
-
-#~ msgid ""
-#~ "<p class=\"usb\">The most difficult part is over!\n"
-#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">La parte más difícil ya está hecha!\n"
-#~ "Ahora toma la segunda memoria USB, que ya es tiempo de instalar el Tails final en ella.</p>\n"
-
-#~ msgid ""
-#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
-#~ "you to store some of your documents and configuration\n"
-#~ "and benefit from automatic security upgrades.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">Es importante instalar el Tails final porque permite\n"
-#~ "guardar algunos de tus documentos y configuraciones\n"
-#~ "y beneficiarte de las actualizaciones de seguridad automáticas.</p>\n"
-
-#~ msgid ""
-#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
-#~ "\"install-clone mac-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\" alt=\"Memoria USB conectada en la izquierda"
-#~ "\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   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"
+msgid "   ### Check our list of known issues\n"
+msgstr "   ### Consulta nuestra lista de problemas conocidos\n"
 
 #. type: Plain text
 #, no-wrap
@@ -1078,6 +744,383 @@ 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?"
 
+#. type: Plain text
+#, no-wrap
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Pantalla negra con el logo de Tails. Menú de arranque con dos opciones 'Tails' y 'Tails (Modo seguro)'.\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
+msgid ""
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
+msgstr ""
+"   <p>Si tu computador no arranca desde el DVD Tails, tal vez sea imposible por ahora arrancar Tails desde tu modelo de Mac.</p>\n"
+"   </div>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
+msgstr ""
+"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class="
+"\"application\">Tails Greeter</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\n"
+msgstr ""
+"   <div class=\"note\">\n"
+"   <p>Si la computadora muestra el mensaje de error\n"
+"   <span class=\"guilabel\">Error iniciando GDM con tu tarjeta\n"
+"   gráfica</span>, revisa nuestra [[lista de problemas conocidos con tarjetas\n"
+"   gráficas|support/known_issues/graphics]].</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+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 ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+"   Tails no arranca completamente\n"
+"   ------------------------------\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+"   La siguiente sección aplica si el <span class=\"application\">Menú de cargador de arranque</span> aparece, pero no aparece el\n"
+"   <span class=\"application\">Tails Greeter</span> al arracar Tails.\n"
+
+#. type: Bullet: '   1. '
+msgid "Restart the computer on the first USB stick."
+msgstr "Reinicia la computadora en el primer dispositivo USB."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\n"
+msgstr ""
+"   1. En el <span class=\"application\"> Menú del cargador de arranque</span>, escoge el\n"
+"   <span class=\"guilabel\">Troubleshooting Mode </span>\n"
+"   que puede funcionar mejor en algunos computadores.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\n"
+msgstr ""
+"   1. Si el <span class=\"guilabel\">Troubleshooting Mode</span> no funciona\n"
+"   mejor, reinicia el computador de nuevo desde la primera memoria USB.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\n"
+msgstr ""
+"   1. En el <span class=\"application\">Menú de cargador de arranque</span>, oprime\n"
+"   <span class=\"keycap\">TAB</span>. Una línea de comando con una lista\n"
+" de opciones de arranque aparecerá abajo de la pantalla.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
+msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Pantalla negra con el logo de Tails y una lista de opciones de arranque\"]]\n"
+
+#. type: Bullet: '   1. '
+msgid ""
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
+msgstr ""
+"Oprime la tecla <span class=\"keycap\">Tecla de borrar</span>varias veces "
+"para quitar las <span class=\"code\">opciones  de la linea de comando que no "
+"apliquen</span>."
+
+#. type: Bullet: '   1. '
+msgid ""
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
+msgstr ""
+"Si Tails falló previamente al iniciar y mostró el error <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para "
+"agregar esta opción a la línea de comandos."
+
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
+msgstr ""
+"Escribe `debug nosplash` para agregar estas opciones a la línea de comandos."
+
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr ""
+"Para arrancar Tails oprime la tecla <span class=\"keycap\">Enter / de "
+"retorno</span>."
+
+#. type: Bullet: '   1. '
+msgid ""
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
+msgstr ""
+"Mensajes de error deberían aparecer ahora al arrancar Tails. Puedes "
+"[[enviarlos a nuestro equipo de asistencia \n"
+"por correo |support/talk]], por ejemplo tomando una foto a la ultima "
+"pantalla y al mensaje de error."
+
+#. type: Bullet: '   1. '
+msgid ""
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
+msgstr ""
+"si el mensaje de error es <span class=\"code\">/bin/sh: can't access tty; "
+"job control turned off</span> seguido de <span class=\"code\">(initramfs)</"
+"span>, puedes intentar quitar la opción <span class=\"code\">live-"
+"media=removable</span> de la línea de arranque."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\n"
+msgstr ""
+"      Si quitar <span class=\"code\">live-media=removable</span> te permite arrancar Tails, te agradeceríamos\n"
+"      que informes del problema a nuestro [[equipo de asistencia|support/talk]].\n"
+"      Eso nos permite mejorar la [[lista\n"
+"      de memorias USB problemáticas|support/known_issues#problematic-usb-sticks]].\n"
+"      Luego intenta instalar Tails con otra memoria USB.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</p>\n"
+"   </div>\n"
+msgstr ""
+"   <div class=\"caution\">\n"
+"   <p>Quitar la opción <span class=\"code\">live-media=removable</span>\n"
+"   puede ser peligroso. Si un adversario tiene acceso al computador e\n"
+"   instala un Tails malicioso sobre un disco duro interno, el computador\n"
+"   podría arracar desde el Tails malicioso en vez de la memoria USB.</p>\n"
+"   </div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
+msgstr "1. En el <span class=\"application\">Tails Greeter</span> elige tu idioma y la configuración de tu teclado en la sección <span class=\"guilabel\">Language & Region</span> y presiona <span class=\"button\">Start Tails</span>.\n"
+
+#. type: Bullet: '1. '
+msgid "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr "Luego de 15&ndash;30 segundos, el escritorio de Tails aparecerá."
+
+#. type: Plain text
+#, no-wrap
+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 "   [[!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/infography/restart-on-tails.png link=\"no\" class="
+#~ "\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
+#~ "\"debian\" alt=\"Computadora reiniciada en la memoria USB en la derecha"
+#~ "\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
+#~ "alt=\"Computer restarted on DVD\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
+#~ "alt=\"Computadora reiniciada en DVD\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</"
+#~ "span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Opción</span> (<span class=\"keycap\">Alt</"
+#~ "span> key) hasta que aparezca la lista de discos de arranque.</p>\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\" alt=\"Tecla 'opción' o 'alt' en la parte inferior izquierda del "
+#~ "teclado de Mac\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the "
+#~ "following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Enter</span>. El DVD\n"
+#~ "   puede estar etiquetado como <span class=\"guilabel\">Windows</span> "
+#~ "como en la siguiente captura de pantalla:</p>\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no"
+#~ "\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh "
+#~ "HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no"
+#~ "\" alt=\"Pantalla con el logo de un disco duro interno etiquetado "
+#~ "'Macintosh HD' y un DVD etiquetado 'Windows' (seleccionado)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
+#~ "   reinstalling an intermediary Tails from [[Windows using\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>Si solo aparece tu disco duro Macintosh, puedes intentar\n"
+#~ "   reinstalando un Tails intermedio desde [[Windows usando\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Si tu computadora falla al iniciar en el Tails intermedio, puedes\n"
+#~ "   intentar estos otros dos métodos:</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Instalar desde otro sistema operativo|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Instalar por linea de comando|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Si ya lo has intentado sin lograrlo, tal vez sea imposible arrancar "
+#~ "Tails desde tu modelo de Mac.</p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails "
+#~ "on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La parte más difícil ya está hecha!\n"
+#~ "Ahora toma la segunda memoria USB, que ya es tiempo de instalar el Tails "
+#~ "final en ella.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Es importante instalar el Tails final porque permite\n"
+#~ "guardar algunos de tus documentos y configuraciones\n"
+#~ "y beneficiarte de las actualizaciones de seguridad automáticas.</p>\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class="
+#~ "\"install-clone mac-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\" alt=\"Memoria USB conectada en la izquierda"
+#~ "\"]]\n"
+
 #~ msgid "<span class=\"application\">Universal USB Installer</span>,"
 #~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
 
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 ec21f4038604c5c159669badfece22a9955483be..bbc036daf128f2a5a8e27362a524f29be1323641 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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"
@@ -147,7 +147,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -191,7 +191,7 @@ msgid ""
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr ""
 
@@ -244,195 +244,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "Restart the computer on the first USB stick."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "Type `debug nosplash` to add these options to the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"caution\">\n"
-"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   Tails does not start at all\n"
-"   ---------------------------\n"
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
 msgstr ""
 
 #. type: Plain text
@@ -755,6 +568,188 @@ msgstr ""
 msgid "Does the same USB stick or DVD start successfully on other computers?"
 msgstr "آیا همان روش و دستگاه روی رایانه‌های دیگر به درستی راه‌اندازی می‌شود؟"
 
+#. type: Plain text
+#, no-wrap
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+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 ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Restart the computer on the first USB stick."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr ""
+
+#. type: Plain text
+#, 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 "
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 dd236e2356fa1a7ee2feb229685b1a8801f2560b..7e3c6724113b995d42b366c0e671d236840bf481 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+0000\n"
 "PO-Revision-Date: 2018-04-20 11:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -180,7 +180,7 @@ msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"c
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
 
 #. type: Plain text
@@ -258,7 +258,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."
 
@@ -332,506 +332,171 @@ 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
-#, no-wrap
-msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
-msgstr ""
-"   Résolution des problèmes\n"
-"   ---------------\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Écran noir avec le logo de Tails. Menu du chargeur d’amorçage avec deux options 'Tails' et 'Tails (Troubleshooting Mode)'.\"]]\n"
-
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
-#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-#| "   be impossible to start Tails on your Mac model.</p>\n"
-#| "   </div>\n"
-msgid ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-"   <p>Si votre ordinateur n'arrive pas à démarrer sur le DVD Tails, alors il est peut-être actuellement\n"
-"   impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
-"   </div>\n"
-
-#. type: Bullet: '1. '
+#| "   Tails does not start at all\n"
+#| "   ---------------------------\n"
 msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
 msgstr ""
-"Après 30&ndash;60 secondes, un autre écran appelé <span class=\"application"
-"\">Tails Greeter</span> apparaît."
+"   Tails ne démarre pas du tout\n"
+"   ----------------------------\n"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
+"   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 ""
-"   <div class=\"note\">\n"
-"   <p>Si l'ordinateur affiche le message d'erreur\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, consultez notre [[liste des problèmes connus avec des cartes\n"
-"   graphiques|support/known_issues/graphics]].</p>\n"
+"   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 ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
+"   It is quite common for computers not to start automatically on a\n"
+"   USB stick with Tails installed. Here are some troubleshooting techniques. You should try them\n"
+"   one after the other.\n"
 msgstr ""
-"   <p>Si l'ordinateur ne répond plus ou affiche un autre message d'erreur avant\n"
-"   d'afficher le <span class=\"application\">Tails Greeter</span>, voir la\n"
-"   [[!toggle id=\"not_entirely\" text=\"partie résolution des problèmes\n"
-"   concernant Tails ne démarre pas complètement\"]].</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+"   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 "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
+msgid "   ### Getting to the boot menu\n"
+msgstr "   ### Obtenir le menu de démarrage\n"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
+"   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 ""
-"   Tails ne démarre pas complètement\n"
-"   -----------------------------\n"
+"   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 ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
-msgstr ""
-"   La section suivante s'applique si le <span class=\"application\">menu du chargeur d’amorçage</span> apparaît mais pas le\n"
-"   <span class=\"application\">Tails Greeter</span> quand Tails démarre.\n"
+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 "Restart the computer on the first USB stick."
-msgstr "Redémarrer l'ordinateur sur la première clé USB."
+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. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
 msgstr ""
-"   1. Dans le <span class=\"application\">menu du chargeur d’amorçage</span>, choisir le mode <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"  qui devrait mieux marcher sur certains ordinateurs.\n"
+"   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 ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
+"      <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 ""
-"   1. Si le mode <span class=\"guilabel\">Troubleshooting Mode</span> ne marche pas\n"
-"   mieux, redémarrer à nouveau l'ordinateur sur la première clé USB.\n"
+"      <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 ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
-msgstr ""
-"   1. Dans le <span class=\"application\">menu du chargeur d’amorçage</span>, appuyer sur\n"
-"   <span class=\"keycap\">TAB</span>. Une ligne de commande avec une liste\n"
-"   d'options de démarrage apparaît en bas de l'écran.\n"
+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 "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Écran noir avec le logo de Tails et la liste des options de démarrage\"]]\n"
-
-#. type: Bullet: '   1. '
 msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
+"      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 ""
-"Appuyer sur la touche <span class=\"keycap\">Retour arrière</span> plusieurs "
-"fois pour enlever l'option <span class=\"code\">quiet</span> de la ligne de "
-"commande."
+"      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: Bullet: '   1. '
-msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
-msgstr ""
-"Si Tails a échoué précédemment lors du démarrage en affichant l'erreur <span "
-"class=\"code\">Probing EDD (edd=off to disable)...</span>, alors taper "
-"`edd=off` pour ajouter cette option à la ligne de commande."
+#. 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 "Type `debug nosplash` to add these options to the command line."
+#. type: Bullet: '         1. '
+msgid "Press-and-hold the potential boot menu key identified in step 3."
 msgstr ""
-"Taper `debug nosplash` pour ajouter ces options à la ligne de commande."
-
-#. type: Bullet: '   1. '
-msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
-msgstr "Pour démarrer Tails, appuyer sur <span class=\"keycap\">Entrée</span>."
+"Maintenir appuyé la touche de démarrage potentielle identifiée à l'étape 3."
 
-#. type: Bullet: '   1. '
+#. type: Bullet: '         1. '
 msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
 msgstr ""
-"Espérons que des messages d'erreur apparaissent désormais au démarrage de "
-"Tails. Vous pouvez les [[envoyer à notre équipe d'assistance par courrier "
-"électronique|support/talk]], en faisant par exemple une capture du dernier "
-"écran et des derniers messages d'erreur."
+"Démarrer l'ordinateur de nouveau tout en gardant appuyé la touche possible."
 
-#. type: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
+"            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 ""
-"Si le message d'erreur est <span class=\"code\">/bin/sh: can't access tty; "
-"job control turned off</span> suivi de <span class=\"code\">(initramfs)</"
-"span>, alors essayez d'enlever l'option <span class=\"code\">live-"
-"media=removable</span> de la ligne de commande de démarrage."
+"            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 ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
+"            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 ""
-"      Si enlever <span class=\"code\">live-media=removable</span> vous permet de démarrer Tails, merci\n"
-"      de signaler le problème à notre [[équipe d'assistance|support/talk]].\n"
-"      Cela contribue à améliorer la [[liste\n"
-"      des clés USB problématiques|support/known_issues#problematic-usb-sticks]].\n"
-"      Ensuite, essayez d'installer Tails sur une autre clé USB.\n"
+"            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 ""
-"   <div class=\"caution\">\n"
-"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\n"
-"   </div>\n"
+"   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 ""
-"   <div class=\"caution\">\n"
-"   <p>Supprimer l'option <span class=\"code\">live-media=removable</span>\n"
-"   peut-être dangereux. Si un adversaire a eu accès à l'ordinateur et\n"
-"   a installé un Tails malicieux sur le disque dur interne, l'ordinateur\n"
-"   pourrait démarrer sur le Tails malicieux à la place de la clé USB.</p>\n"
-"   </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter : 'Bienvenue dans Tails !'\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
-msgstr ""
-"1. Dans le <span class=\"application\">Tails Greeter</span>, sélectionnez votre langue et\n"
-"votre disposition de clavier dans la section <span class=\"guilabel\">Langue et région</span>.\n"
-"Cliquez sur <span class=\"button\">Démarrer Tails</span>.\n"
-
-#. type: Bullet: '1. '
-msgid "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr "Après 15&ndash;30 secondes, le bureau de Tails apparaît."
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
-msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau Tails\"]]\n"
-
-#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#~ msgid "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-#~ msgstr "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#~ msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-#~ msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite\"]]\n"
-
-#~ msgid "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Computer restarted on DVD\"]]\n"
-#~ msgstr "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" alt=\"Ordinateur redémarrant sur un DVD\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-#~ "   disks appears.</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Option</span> (touche <span class=\"keycap\">Alt</span>) jusqu'à ce qu'une liste de disques\n"
-#~ "   de démarrage apparaisse.</p>\n"
-
-#~ msgid "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no\" alt=\"Touche 'Option' ou 'alt' en bas à gauche du clavier Mac\"]]\n"
-
-#~ msgid ""
-#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
-#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Entrée</span>. Le DVD\n"
-#~ "   devrait être nommé <span class=\"guilabel\">Windows</span> comme sur la capture d'écran suivante :</p>\n"
-
-#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Écran avec le logo d'un disque dur interne nommé 'Macintosh HD' et un DVD nommé 'Windows' (sélectionné)\"]]\n"
-
-#~ msgid ""
-#~ "   <div class=\"bug mac\">\n"
-#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
-#~ "   reinstalling an intermediary Tails from [[Windows using\n"
-#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac\">\n"
-#~ "   <p>Si votre disque dur Macintosh est le seul à apparaître, vous pouvez essayer\n"
-#~ "   de réinstaller un Tails intermédiaire depuis [[Windows en utilisant\n"
-#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
-#~ "   </div>\n"
-
-#~ msgid ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
-#~ "   try these other two methods:</p>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>Si votre ordinateur ne démarre pas sur le Tails intermédiaire, vous pouvez\n"
-#~ "   essayer ces deux autres méthodes :</p>\n"
-
-#~ msgid ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-#~ msgstr ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Installer depuis un autre système d'exploitation|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Installer depuis la ligne de commande|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-
-#~ msgid ""
-#~ "   <p>If you tried them already but failed as well, then it might\n"
-#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <p>Si vous essayez une nouvelle fois mais échouez également, alors il est peut-être\n"
-#~ "   actuellement impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
-#~ "   </div>\n"
-
-#~ msgid ""
-#~ "<p class=\"usb\">The most difficult part is over!\n"
-#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">La partie la plus difficile est passée !\n"
-#~ "Maintenant emparez-vous de votre seconde clé USB car il est temps d'installer le Tails définitif dessus.</p>\n"
-
-#~ msgid ""
-#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
-#~ "you to store some of your documents and configuration\n"
-#~ "and benefit from automatic security upgrades.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">Il est important d'installer le Tails définitif pour que vous\n"
-#~ "puissiez stocker certains de vos documents et configurations\n"
-#~ "et bénéficier des mises à jour de sécurité automatiques.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   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"
+"   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
@@ -1083,6 +748,386 @@ msgstr ""
 "Est-ce que la même clé USB ou le même DVD démarre correctement sur d'autres "
 "ordinateurs ?"
 
+#. type: Plain text
+#, no-wrap
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Écran noir avec le logo de Tails. Menu du chargeur d’amorçage avec deux options 'Tails' et 'Tails (Troubleshooting Mode)'.\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
+msgid ""
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
+msgstr ""
+"   <p>Si votre ordinateur n'arrive pas à démarrer sur le DVD Tails, alors il est peut-être actuellement\n"
+"   impossible de démarrer Tails sur votre modèle de Mac.</p>\n"
+"   </div>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
+msgstr ""
+"Après 30&ndash;60 secondes, un autre écran appelé <span class=\"application"
+"\">Tails Greeter</span> apparaît."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\n"
+msgstr ""
+"   <div class=\"note\">\n"
+"   <p>Si l'ordinateur affiche le message d'erreur\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, consultez notre [[liste des problèmes connus avec des cartes\n"
+"   graphiques|support/known_issues/graphics]].</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\n"
+msgstr ""
+"   <p>Si l'ordinateur ne répond plus ou affiche un autre message d'erreur avant\n"
+"   d'afficher le <span class=\"application\">Tails Greeter</span>, voir la\n"
+"   [[!toggle id=\"not_entirely\" text=\"partie résolution des problèmes\n"
+"   concernant Tails ne démarre pas complètement\"]].</p>\n"
+"   </div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+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 ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+"   Tails ne démarre pas complètement\n"
+"   -----------------------------\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+"   La section suivante s'applique si le <span class=\"application\">menu du chargeur d’amorçage</span> apparaît mais pas le\n"
+"   <span class=\"application\">Tails Greeter</span> quand Tails démarre.\n"
+
+#. type: Bullet: '   1. '
+msgid "Restart the computer on the first USB stick."
+msgstr "Redémarrer l'ordinateur sur la première clé USB."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\n"
+msgstr ""
+"   1. Dans le <span class=\"application\">menu du chargeur d’amorçage</span>, choisir le mode <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"  qui devrait mieux marcher sur certains ordinateurs.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\n"
+msgstr ""
+"   1. Si le mode <span class=\"guilabel\">Troubleshooting Mode</span> ne marche pas\n"
+"   mieux, redémarrer à nouveau l'ordinateur sur la première clé USB.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\n"
+msgstr ""
+"   1. Dans le <span class=\"application\">menu du chargeur d’amorçage</span>, appuyer sur\n"
+"   <span class=\"keycap\">TAB</span>. Une ligne de commande avec une liste\n"
+"   d'options de démarrage apparaît en bas de l'écran.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
+msgstr "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Écran noir avec le logo de Tails et la liste des options de démarrage\"]]\n"
+
+#. type: Bullet: '   1. '
+msgid ""
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
+msgstr ""
+"Appuyer sur la touche <span class=\"keycap\">Retour arrière</span> plusieurs "
+"fois pour enlever l'option <span class=\"code\">quiet</span> de la ligne de "
+"commande."
+
+#. type: Bullet: '   1. '
+msgid ""
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
+msgstr ""
+"Si Tails a échoué précédemment lors du démarrage en affichant l'erreur <span "
+"class=\"code\">Probing EDD (edd=off to disable)...</span>, alors taper "
+"`edd=off` pour ajouter cette option à la ligne de commande."
+
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
+msgstr ""
+"Taper `debug nosplash` pour ajouter ces options à la ligne de commande."
+
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr "Pour démarrer Tails, appuyer sur <span class=\"keycap\">Entrée</span>."
+
+#. type: Bullet: '   1. '
+msgid ""
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
+msgstr ""
+"Espérons que des messages d'erreur apparaissent désormais au démarrage de "
+"Tails. Vous pouvez les [[envoyer à notre équipe d'assistance par courrier "
+"électronique|support/talk]], en faisant par exemple une capture du dernier "
+"écran et des derniers messages d'erreur."
+
+#. type: Bullet: '   1. '
+msgid ""
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
+msgstr ""
+"Si le message d'erreur est <span class=\"code\">/bin/sh: can't access tty; "
+"job control turned off</span> suivi de <span class=\"code\">(initramfs)</"
+"span>, alors essayez d'enlever l'option <span class=\"code\">live-"
+"media=removable</span> de la ligne de commande de démarrage."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\n"
+msgstr ""
+"      Si enlever <span class=\"code\">live-media=removable</span> vous permet de démarrer Tails, merci\n"
+"      de signaler le problème à notre [[équipe d'assistance|support/talk]].\n"
+"      Cela contribue à améliorer la [[liste\n"
+"      des clés USB problématiques|support/known_issues#problematic-usb-sticks]].\n"
+"      Ensuite, essayez d'installer Tails sur une autre clé USB.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</p>\n"
+"   </div>\n"
+msgstr ""
+"   <div class=\"caution\">\n"
+"   <p>Supprimer l'option <span class=\"code\">live-media=removable</span>\n"
+"   peut-être dangereux. Si un adversaire a eu accès à l'ordinateur et\n"
+"   a installé un Tails malicieux sur le disque dur interne, l'ordinateur\n"
+"   pourrait démarrer sur le Tails malicieux à la place de la clé USB.</p>\n"
+"   </div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter : 'Bienvenue dans Tails !'\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
+msgstr ""
+"1. Dans le <span class=\"application\">Tails Greeter</span>, sélectionnez votre langue et\n"
+"votre disposition de clavier dans la section <span class=\"guilabel\">Langue et région</span>.\n"
+"Cliquez sur <span class=\"button\">Démarrer Tails</span>.\n"
+
+#. type: Bullet: '1. '
+msgid "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr "Après 15&ndash;30 secondes, le bureau de Tails apparaît."
+
+#. type: Plain text
+#, no-wrap
+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 "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\" alt=\"\"]]\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
+#~ "\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
+#~ "\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite"
+#~ "\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
+#~ "alt=\"Computer restarted on DVD\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"\" "
+#~ "alt=\"Ordinateur redémarrant sur un DVD\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</"
+#~ "span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Option</span> (touche <span class=\"keycap"
+#~ "\">Alt</span>) jusqu'à ce qu'une liste de disques\n"
+#~ "   de démarrage apparaisse.</p>\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\" alt=\"'Option' or 'alt' key in the bottom left of Mac keyboard\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\" alt=\"Touche 'Option' ou 'alt' en bas à gauche du clavier Mac\"]]\n"
+
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the "
+#~ "following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Entrée</span>. Le DVD\n"
+#~ "   devrait être nommé <span class=\"guilabel\">Windows</span> comme sur "
+#~ "la capture d'écran suivante :</p>\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no"
+#~ "\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh "
+#~ "HD' and a DVD labelled 'Windows' (selected)\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no"
+#~ "\" alt=\"Écran avec le logo d'un disque dur interne nommé 'Macintosh HD' "
+#~ "et un DVD nommé 'Windows' (sélectionné)\"]]\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>If only your Macintosh hard drive appears, you can try\n"
+#~ "   reinstalling an intermediary Tails from [[Windows using\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac\">\n"
+#~ "   <p>Si votre disque dur Macintosh est le seul à apparaître, vous pouvez "
+#~ "essayer\n"
+#~ "   de réinstaller un Tails intermédiaire depuis [[Windows en utilisant\n"
+#~ "   <span class=\"application\">Universal USB Installer</span>|win/usb]].</"
+#~ "p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Si votre ordinateur ne démarre pas sur le Tails intermédiaire, vous "
+#~ "pouvez\n"
+#~ "   essayer ces deux autres méthodes :</p>\n"
+
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installer depuis un autre système "
+#~ "d'exploitation|install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Installer depuis la ligne de commande|mac/"
+#~ "usb]]</li>\n"
+#~ "   </ul>\n"
+
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Si vous essayez une nouvelle fois mais échouez également, alors il "
+#~ "est peut-être\n"
+#~ "   actuellement impossible de démarrer Tails sur votre modèle de Mac.</"
+#~ "p>\n"
+#~ "   </div>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails "
+#~ "on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La partie la plus difficile est passée !\n"
+#~ "Maintenant emparez-vous de votre seconde clé USB car il est temps "
+#~ "d'installer le Tails définitif dessus.</p>\n"
+
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">Il est important d'installer le Tails définitif pour que "
+#~ "vous\n"
+#~ "puissiez stocker certains de vos documents et configurations\n"
+#~ "et bénéficier des mises à jour de sécurité automatiques.</p>\n"
+
 #~ msgid "<span class=\"application\">Universal USB Installer</span>,"
 #~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
 
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 1e70f182843dc9b5ee3281770c9931e02adf84e1..3e34543ac796519d76e76eca5807270a2805ed0b 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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"
@@ -182,7 +182,7 @@ msgstr "[[!img install/inc/infography/plug-other-tails.png link=\"no\" class=\"i
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr "[[!img install/inc/infography/restart-on-other-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
 
 #. type: Plain text
@@ -261,7 +261,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."
 
@@ -341,874 +341,891 @@ 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
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   Tails does not start at all\n"
+#| "   ---------------------------\n"
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
 msgstr ""
-"   Risoluzione dei problemi\n"
-"   ---------------\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "   [[!inline pages=\"install/inc/steps/not_at_all.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schermo nero con il disegno di Tails. 'Menù di avvio' con due opzioni, 'Live' e 'Live (failsafe)'.\"]]\n"
+"   Tails non si avvia affatto\n"
+"   ----------------------------\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
-#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
-#| "   be impossible to start Tails on your Mac model.</p>\n"
-#| "   </div>\n"
+#| "   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 ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
+"   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 ""
-"   <p>Se il tuo computer non si avvia dal DVD Tails, potrebbe essere\n"
-"   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
-"   </div>\n"
+"   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: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
+"   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 ""
-"Dopo 30&ndash;60 secondi, un altro schermo chiamato <span class=\"application"
-"\">Tails Greeter</span> compare."
+"   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 ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
-msgstr ""
+msgid "   ### Getting to the boot menu\n"
+msgstr "   ###Arrivare al menù di avvio\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   <div class=\"note\">\n"
-#| "   <p>If the computer stops responding or displays error messages before\n"
-#| "   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-#| "   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-#| "   Tails not starting entirely\"]].</p>\n"
-#| "   </div>\n"
+#, no-wrap
 msgid ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
+"   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 ""
-"   <div class=\"note\">\n"
-"   <p>Se il computer smette di rispondere o mostra un messaggio d'errore prima di\n"
-"   arrivare al <span class=\"application\">Tails Greeter</span>, fai riferimento alla\n"
-"   [[!toggle id=\"not_entirely\" text=\"sessione di risoluzione dei problemi per quando\n"
-"   Tails non si avvia\"]].</p>\n"
-"   </div>\n"
+"   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 "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+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: Plain text
-#, no-wrap
-msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\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 ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
+"   1. Identify the potential boot menu keys for the computer depending on\n"
+"   the computer manufacturer in the following list:\n"
 msgstr ""
-"   Tails non si avvia\n"
-"   -----------------------------\n"
+"   1. Identifica il potenziale tasto menù d'avvio per il computer a seconda del\n"
+"   suo produttore dalla seguente lista:\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
-#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+#, no-wrap
 msgid ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+"      <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 ""
-"   La seguente sessione si applica a quando il menù <span class=\"guilabel\">Avvia Tails</span> compare, ma non il\n"
-"   <span class=\"application\">Tails Greeter</span> quando si avvia Tails.\n"
+"      <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: Bullet: '   1. '
-msgid "Restart the computer on the first USB stick."
-msgstr "Riavvia il computer sulla prima chiave USB."
+#. 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
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, choose the <span class=\"guilabel\">failsafe</span>\n"
-#| "   mode which might work better on some computers.\n"
+#, no-wrap
 msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
+"      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 ""
-"   1. Nel menù <span class=\"guilabel\">Avvia Tails</span>, scegli la modalità <span class=\"guilabel\">failsafe</span>\n"
-"   che potrebbe funzionare meglio su alcuni computer.\n"
+"      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
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. If the <span class=\"guilabel\">failsafe</span> mode does not work\n"
-#| "   better, restart the computer again on the first USB stick.\n"
-msgid ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
+#, 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 ""
-"   1. Se la modalità <span class=\"guilabel\">failsafe</span> non funziona\n"
-"   meglio, riavvia il computer di nuovo sulla prima chiave USB.\n"
+"Premi e tieni premuto il potenziale tasto menù d'avvio identificato nel "
+"passaggio 3."
 
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, press\n"
-#| "   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-#| "   of boot options appears at the bottom of the screen.\n"
+#. type: Bullet: '         1. '
 msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
+"Switch on the computer again while holding the potential boot menu key "
+"pressed."
 msgstr ""
-"   1. Nel menù <span class=\"guilabel\">Avvia Tails</span>, premi\n"
-"   <span class=\"keycap\">TAB</span>. Una linea di comando con una\n"
-"    lista di opzioni compare sul fondo dello schermo.\n"
+"Riaccendi di nuovo il computer tenendo premuto il potenziale tasto menù di "
+"avvio."
 
 #. type: Plain text
 #, no-wrap
-msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
 msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
+"            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 ""
-"Premi il tasto <span class=\"keycap\">Backspace</span> molte volte per "
-"rimuovere l'opzione <span class=\"code\">quiet</span> dalla linea di comando."
+"            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: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
+"            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: Bullet: '   1. '
-msgid "Type `debug nosplash` to add these options to the command line."
+#. 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 ""
-"Digita 'debug nosplash' per aggiungere queste opzioni alla riga di comando."
+"   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: Bullet: '   1. '
-msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
-msgstr "Per avviare Tails, premi <span class=\"keycap\">Invio</span>."
+#. type: Plain text
+#, no-wrap
+msgid "   ### Check our list of known issues\n"
+msgstr "   ### Controlla la nostra lista di problemi conosciuti\n"
 
-#. type: Bullet: '   1. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
+"   Similar problems might have been reported already for your model of computer\n"
+"   in our [[list of known issues|support/known_issues]].\n"
 msgstr ""
-"Dei messaggi d'errore dovrebbero ora apparire all'avvio di Tails. Puoi "
-"[[inviarli al nostro team di supporto via email|support/talk]], per esempio "
-"facendo una foto all'ultima schermata e messaggio d'errore."
+"   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: Bullet: '   1. '
+#. 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 ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
+"   <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 ""
-"Se il messaggio d'errore è <span class=\"code\">/bin/sh: can't access tty; "
-"job control turned off</span> seguito da <span class=\"code\">(initramfs)</"
-"span>, prova a rimuovere l'opzione <span class=\"code\">live-"
-"media=removable</span> dalla riga di comando d'avvio."
+"   <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 ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
+"   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 ""
-"      Se rimuovere <span class=\"code\">live-media=removable</span> ti consente di avviare Tails, per favore\n"
-"      riporta il problema al nostro [[team di supporto|support/talk]].\n"
-"      Questo contribuisce a migliorare la [[lista\n"
-"      delle chiavi USB problematiche|support/known_issues#problematic-usb-sticks]].\n"
-"      Quindi prova a installare da un'altra chiave USB.\n"
+"    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>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\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>Rimuovere l'opzione <span class=\"code\">live-media=removable</span>\n"
-"   potrebbe essere pericoloso. Se un avverario ha avuto accesso al computer e\n"
-"   ha installato una Tails malevola su un hard disk interno, il computer\n"
-"   potrebbe avviarsi sulla Tails malevola invece che sulla chiave USB.</p>\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
-#, fuzzy, no-wrap
-#| msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
-msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
-#| "list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
+#, no-wrap
 msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
+"   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. In <span class=\"application\">Tails Greeter</span>, seleziona la tua lingua preferita nella lista a cascata\n"
-"sull'angolo in basso a sinistra dello schermo. Clicca su <span class=\"button\">Login</span>.\n"
+"   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 "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr "Dopo 15&ndash;30 secondi, ti apparirà il Desktop di Tails."
+#. type: Bullet: '   1. '
+msgid "Disable **Fast boot**."
+msgstr "Disabilita **Avvio rapido**."
 
 #. type: Plain text
 #, no-wrap
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
+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"
 
-#~ msgid ""
-#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
-#~ "   disks appears.</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Opzione</span> (<span class=\"keycap\">Alt</span> key) finché non appare una lista di\n"
-#~ "   possibili dischi d'avvio.</p>\n"
-#~ "\n"
+#. type: Bullet: '      - '
+msgid "Enable **Legacy mode**"
+msgstr "Abilita **Legacy mode**"
 
-#~ msgid ""
-#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
-#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
-#~ msgstr ""
-#~ "   <span class=\"keycap\">Invio</span>. Il DVD\n"
-#~ "   potrebbe essere etichettato <span class=\"guilabel\">Windows</span> come nello screenshot seguente:</p>\n"
+#. type: Bullet: '      - '
+msgid ""
+"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
+"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
+"boot))"
+msgstr ""
 
-#~ msgid "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Screen with the logo of an internal hard disk labeled 'Macintosh HD' and a DVD labelled 'Windows' (selected)\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/mac_startup_dvd.png class=\"\" link=\"no\" alt=\"Schermo con il logo di un hard disk interno etichettato 'Macintosh HD' e un DVD etichettato 'Windows' (selezionato)\"]]\n"
+#. type: Bullet: '      - '
+msgid "Enable **CSM boot**"
+msgstr "Abilita **CSM boot**"
 
-#~ msgid ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
-#~ "   try these other two methods:</p>\n"
-#~ msgstr ""
-#~ "   <div class=\"bug mac-usb mac-clone\">\n"
-#~ "   <p>Se il tuo computer non si avvia sulla Tails intermediaria, puoi\n"
-#~ "   provare questi altri due metodi:</p>\n"
+#. type: Bullet: '      - '
+msgid "Disable **UEFI**"
+msgstr "Disabilita **UEFI**"
 
-#~ msgid ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Install from another operating system|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</li>\n"
-#~ "   </ul>\n"
-#~ msgstr ""
-#~ "   <ul>\n"
-#~ "     <li class=\"mac-usb\">[[Installa da un altro sistema operativo|install]]</li>\n"
-#~ "     <li class=\"mac-clone\">[[Installa dalla riga di comando|mac/usb]]</li>\n"
-#~ "   </ul>\n"
+#. type: 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."
 
-#~ msgid ""
-#~ "   <p>If you tried them already but failed as well, then it might\n"
-#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
-#~ "   </div>\n"
-#~ msgstr ""
-#~ "   <p>Se le hai già trovate ma hai comunque fallito, potrebbe essere\n"
-#~ "   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
-#~ "   </div>\n"
+#. type: Plain text
+#, no-wrap
+msgid "   ### Report the problem to our support team\n"
+msgstr "   # Riporta i problemi al nostro team di supporto\n"
 
-#~ msgid ""
-#~ "<p class=\"usb\">The most difficult part is over!\n"
-#~ "Now grab your second USB stick as it is time to install the final Tails on it.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">La parte più difficile è finita!\n"
-#~ "Ora prendi la tua seconda chiave USB perché è tempo di installarci sopra la Tails finale.</p>\n"
+#. 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"
 
-#~ msgid ""
-#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
-#~ "you to store some of your documents and configuration\n"
-#~ "and benefit from automatic security upgrades.</p>\n"
-#~ msgstr ""
-#~ "<p class=\"usb\">E' importante installare la Tails finale perché ti\n"
-#~ "consente di archiviare alcuni dei tuoi documenti e configurazioni\n"
-#~ "e beneficia di aggiornamenti di sicurezza automatici.</p>\n"
+#. 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"
 
-#~ msgid ""
-#~ "<div class=\"step-image\">[[!img install/inc/infography/switch-context."
-#~ "png link=\"no\"]]</div>\n"
-#~ msgstr ""
-#~ "<div class=\"step-image\">[[!img install/inc/infography/switch-context."
-#~ "png link=\"no\"]]</div>\n"
+#. type: Bullet: '   1. '
+msgid "Which version of Tails are you trying to start?"
+msgstr "Che versione di Tails stai provando ad avviare?"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="
-#~ "\"install-clone qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="
-#~ "\"install-clone qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '   1. '
+msgid "How did you verify the ISO image?"
+msgstr "Come hai verificato l'immagine ISO?"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="
-#~ "\"windows qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="
-#~ "\"windows qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '   1. '
+msgid "Which is the brand and model of the computer?"
+msgstr "Quali sono la marca e il modello del computer?"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="
-#~ "\"mac-usb qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="
-#~ "\"mac-usb qrcode\" link=\"no\"]]\n"
-
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="
-#~ "\"mac-clone qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="
-#~ "\"mac-clone qrcode\" link=\"no\"]]\n"
-
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
-#~ "qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
-#~ "qrcode\" link=\"no\"]]\n"
+#. 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'è."
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
-#~ "\"debian qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
-#~ "\"debian qrcode\" link=\"no\"]]\n"
+#. 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?"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="
-#~ "\"expert qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="
-#~ "\"expert qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '   1. '
+msgid ""
+"If you are trying to start on a USB stick, which program did you use to "
+"install it:"
+msgstr ""
+"Se stai provando ad avviare Tails da una chiave USB, che programma hai usato "
+"per installarla:"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="
-#~ "\"linux qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="
-#~ "\"linux qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '      - '
+#, fuzzy
+#| msgid "<span class=\"application\">GNOME Disks</span>,"
+msgid "<span class=\"application\">Etcher</span>,"
+msgstr "<span class=\"application\">GNOME Disks</span>,"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="
-#~ "\"upgrade-clone qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="
-#~ "\"upgrade-clone qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">GNOME Disks</span>,"
+msgstr "<span class=\"application\">GNOME Disks</span>,"
 
-#~ msgid ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="
-#~ "\"upgrade-tails qrcode\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="
-#~ "\"upgrade-tails qrcode\" link=\"no\"]]\n"
+#. type: Bullet: '      - '
+msgid "<span class=\"application\">Tails Installer</span>, or"
+msgstr "<span class=\"application\">Tails Installer</span>, o"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class="
-#~ "\"upgrade-clone\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class="
-#~ "\"upgrade-clone\"]]\n"
+#. type: Bullet: '      - '
+msgid "<span class=\"command\">dd</span> on the command line?"
+msgstr "<span class=\"command\">dd</span> sulla riga di comando?"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
-#~ "\"debian\"]]\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"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-"
-#~ "dvd\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-"
-#~ "dvd\"]]\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?"
 
-#~ msgid ""
-#~ "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" "
-#~ "class=\"upgrade-tails\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" "
-#~ "class=\"upgrade-tails\"]]\n"
+#. 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 ""
-#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
-#~ "\"]]\n"
-#~ msgstr ""
-#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
-#~ "\"]]\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'.\"]]\n"
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Schermo nero con il disegno di Tails. 'Menù di avvio' con due opzioni, 'Live' e 'Live (failsafe)'.\"]]\n"
 
-#~ msgid ""
-#~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
-#~ "link=\"no\"]]\n"
-#~ msgstr ""
-#~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
-#~ "link=\"no\"]]\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   <p>If your computer fails to start on the Tails DVD, then it might currently\n"
+#| "   be impossible to start Tails on your Mac model.</p>\n"
+#| "   </div>\n"
+msgid ""
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
+msgstr ""
+"   <p>Se il tuo computer non si avvia dal DVD Tails, potrebbe essere\n"
+"   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
+"   </div>\n"
 
-#~ msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
-#~ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+#. type: Bullet: '1. '
+msgid ""
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
+msgstr ""
+"Dopo 30&ndash;60 secondi, un altro schermo chiamato <span class=\"application"
+"\">Tails Greeter</span> compare."
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Tails does not start at all\n"
-"   ---------------------------\n"
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\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"
+#| "   <div class=\"note\">\n"
+#| "   <p>If the computer stops responding or displays error messages before\n"
+#| "   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+#| "   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+#| "   Tails not starting entirely\"]].</p>\n"
+#| "   </div>\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"
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\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"
+"   <div class=\"note\">\n"
+"   <p>Se il computer smette di rispondere o mostra un messaggio d'errore prima di\n"
+"   arrivare al <span class=\"application\">Tails Greeter</span>, fai riferimento alla\n"
+"   [[!toggle id=\"not_entirely\" text=\"sessione di risoluzione dei problemi per quando\n"
+"   Tails non si avvia\"]].</p>\n"
+"   </div>\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"
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
 
 #. type: Plain text
 #, no-wrap
-msgid "   ### Getting to the boot menu\n"
-msgstr "   ###Arrivare al menù di avvio\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 ""
-"   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"
+"   Troubleshooting\n"
+"   ---------------\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"
+"   Risoluzione dei problemi\n"
+"   ---------------\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"
+msgid ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+"   Tails non si avvia\n"
+"   -----------------------------\n"
 
-#. type: Bullet: '         1. '
-msgid "Shut down the computer."
-msgstr "Spegni il computer."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   The following section applies if the <span class=\"guilabel\">Boot Tails</span> menu appears but not\n"
+#| "   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+"   La seguente sessione si applica a quando il menù <span class=\"guilabel\">Avvia Tails</span> compare, ma non il\n"
+"   <span class=\"application\">Tails Greeter</span> quando si avvia Tails.\n"
 
 #. type: 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."
+msgid "Restart the computer on the first USB stick."
+msgstr "Riavvia il computer sulla prima chiave USB."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, choose the <span class=\"guilabel\">failsafe</span>\n"
+#| "   mode which might work better on some computers.\n"
 msgid ""
-"   1. Identify the potential boot menu keys for the computer depending on\n"
-"   the computer manufacturer in the following list:\n"
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\n"
 msgstr ""
-"   1. Identifica il potenziale tasto menù d'avvio per il computer a seconda del\n"
-"   suo produttore dalla seguente lista:\n"
+"   1. Nel menù <span class=\"guilabel\">Avvia Tails</span>, scegli la modalità <span class=\"guilabel\">failsafe</span>\n"
+"   che potrebbe funzionare meglio su alcuni computer.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. If the <span class=\"guilabel\">failsafe</span> mode does not work\n"
+#| "   better, restart the computer again on the first USB stick.\n"
 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"
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\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"
+"   1. Se la modalità <span class=\"guilabel\">failsafe</span> non funziona\n"
+"   meglio, riavvia il computer di nuovo sulla prima chiave USB.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "   1. In the <span class=\"guilabel\">Boot Tails</span> menu, press\n"
+#| "   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+#| "   of boot options appears at the bottom of the screen.\n"
 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"
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\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"
+"   1. Nel menù <span class=\"guilabel\">Avvia Tails</span>, premi\n"
+"   <span class=\"keycap\">TAB</span>. Una linea di comando con una\n"
+"    lista di opzioni compare sul fondo dello schermo.\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."
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
 msgstr ""
-"Riaccendi di nuovo il computer tenendo premuto il potenziale tasto menù di "
-"avvio."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '   1. '
 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"
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
 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"
+"Premi il tasto <span class=\"keycap\">Backspace</span> molte volte per "
+"rimuovere l'opzione <span class=\"code\">quiet</span> dalla linea di comando."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '   1. '
 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"
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
 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"
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
 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"
+"Digita 'debug nosplash' per aggiungere queste opzioni alla riga di comando."
 
-#. type: Plain text
-#, no-wrap
-msgid "   ### Check our list of known issues\n"
-msgstr "   ### Controlla la nostra lista di problemi conosciuti\n"
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr "Per avviare Tails, premi <span class=\"keycap\">Invio</span>."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '   1. '
 msgid ""
-"   Similar problems might have been reported already for your model of computer\n"
-"   in our [[list of known issues|support/known_issues]].\n"
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
 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"
+"Dei messaggi d'errore dovrebbero ora apparire all'avvio di Tails. Puoi "
+"[[inviarli al nostro team di supporto via email|support/talk]], per esempio "
+"facendo una foto all'ultima schermata e messaggio d'errore."
 
-#. 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"
+#. type: Bullet: '   1. '
 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"
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
 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"
+"Se il messaggio d'errore è <span class=\"code\">/bin/sh: can't access tty; "
+"job control turned off</span> seguito da <span class=\"code\">(initramfs)</"
+"span>, prova a rimuovere l'opzione <span class=\"code\">live-"
+"media=removable</span> dalla riga di comando d'avvio."
 
 #. 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"
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\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"
+"      Se rimuovere <span class=\"code\">live-media=removable</span> ti consente di avviare Tails, per favore\n"
+"      riporta il problema al nostro [[team di supporto|support/talk]].\n"
+"      Questo contribuisce a migliorare la [[lista\n"
+"      delle chiavi USB problematiche|support/known_issues#problematic-usb-sticks]].\n"
+"      Quindi prova a installare da un'altra chiave USB.\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"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</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"
+"   <p>Rimuovere l'opzione <span class=\"code\">live-media=removable</span>\n"
+"   potrebbe essere pericoloso. Se un avverario ha avuto accesso al computer e\n"
+"   ha installato una Tails malevola su un hard disk interno, il computer\n"
+"   potrebbe avviarsi sulla Tails malevola invece che sulla chiave USB.</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**."
+#, fuzzy, no-wrap
+#| msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. In <span class=\"application\">Tails Greeter</span>, select your preferred language in the drop-down\n"
+#| "list on the bottom left of the screen. Click <span class=\"button\">Login</span>.\n"
 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"
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
+msgstr ""
+"1. In <span class=\"application\">Tails Greeter</span>, seleziona la tua lingua preferita nella lista a cascata\n"
+"sull'angolo in basso a sinistra dello schermo. Clicca su <span class=\"button\">Login</span>.\n"
 
-#. type: Bullet: '      - '
-msgid "Enable **Legacy mode**"
-msgstr "Abilita **Legacy mode**"
+#. type: Bullet: '1. '
+msgid "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr "Dopo 15&ndash;30 secondi, ti apparirà il Desktop di Tails."
 
-#. type: Bullet: '      - '
-msgid ""
-"Disable **Secure boot** (see the [Microsoft documentation](https://docs."
-"microsoft.com/en-us/windows-hardware/manufacture/desktop/disabling-secure-"
-"boot))"
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
 msgstr ""
 
-#. type: Bullet: '      - '
-msgid "Enable **CSM boot**"
-msgstr "Abilita **CSM boot**"
+#~ 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: Bullet: '      - '
-msgid "Disable **UEFI**"
-msgstr "Disabilita **UEFI**"
+#~ msgid ""
+#~ "   <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</"
+#~ "span> key) until a list of possible startup\n"
+#~ "   disks appears.</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Opzione</span> (<span class=\"keycap\">Alt</"
+#~ "span> key) finché non appare una lista di\n"
+#~ "   possibili dischi d'avvio.</p>\n"
+#~ "\n"
 
-#. type: 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."
+#~ msgid ""
+#~ "   <span class=\"keycap\">Enter</span>. The DVD\n"
+#~ "   might be labeled <span class=\"guilabel\">Windows</span> like in the "
+#~ "following screenshot:</p>\n"
+#~ msgstr ""
+#~ "   <span class=\"keycap\">Invio</span>. Il DVD\n"
+#~ "   potrebbe essere etichettato <span class=\"guilabel\">Windows</span> "
+#~ "come nello screenshot seguente:</p>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "   ### Report the problem to our support team\n"
-msgstr "   # Riporta i problemi al nostro team di supporto\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"
 
-#. 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"
+#~ msgid ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>If your computer fails to start on the intermediary Tails, you can\n"
+#~ "   try these other two methods:</p>\n"
+#~ msgstr ""
+#~ "   <div class=\"bug mac-usb mac-clone\">\n"
+#~ "   <p>Se il tuo computer non si avvia sulla Tails intermediaria, puoi\n"
+#~ "   provare questi altri due metodi:</p>\n"
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   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"
+#~ msgid ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Install from another operating system|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Install from the command line|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
+#~ msgstr ""
+#~ "   <ul>\n"
+#~ "     <li class=\"mac-usb\">[[Installa da un altro sistema operativo|"
+#~ "install]]</li>\n"
+#~ "     <li class=\"mac-clone\">[[Installa dalla riga di comando|mac/usb]]</"
+#~ "li>\n"
+#~ "   </ul>\n"
 
-#. type: Bullet: '   1. '
-msgid "Which version of Tails are you trying to start?"
-msgstr "Che versione di Tails stai provando ad avviare?"
+#~ msgid ""
+#~ "   <p>If you tried them already but failed as well, then it might\n"
+#~ "   currently be impossible to start Tails on your Mac model.</p>\n"
+#~ "   </div>\n"
+#~ msgstr ""
+#~ "   <p>Se le hai già trovate ma hai comunque fallito, potrebbe essere\n"
+#~ "   impossibile avviare Tails sul tuo modello di Mac.</p>\n"
+#~ "   </div>\n"
 
-#. type: Bullet: '   1. '
-msgid "How did you verify the ISO image?"
-msgstr "Come hai verificato l'immagine ISO?"
+#~ msgid ""
+#~ "<p class=\"usb\">The most difficult part is over!\n"
+#~ "Now grab your second USB stick as it is time to install the final Tails "
+#~ "on it.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">La parte più difficile è finita!\n"
+#~ "Ora prendi la tua seconda chiave USB perché è tempo di installarci sopra "
+#~ "la Tails finale.</p>\n"
 
-#. type: Bullet: '   1. '
-msgid "Which is the brand and model of the computer?"
-msgstr "Quali sono la marca e il modello del computer?"
+#~ msgid ""
+#~ "<p class=\"usb\">It is important to install the final Tails as it allows\n"
+#~ "you to store some of your documents and configuration\n"
+#~ "and benefit from automatic security upgrades.</p>\n"
+#~ msgstr ""
+#~ "<p class=\"usb\">E' importante installare la Tails finale perché ti\n"
+#~ "consente di archiviare alcuni dei tuoi documenti e configurazioni\n"
+#~ "e beneficia di aggiornamenti di sicurezza automatici.</p>\n"
 
-#. 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'è."
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/switch-context."
+#~ "png link=\"no\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/switch-context."
+#~ "png link=\"no\"]]</div>\n"
 
-#. 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?"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="
+#~ "\"install-clone qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="
+#~ "\"install-clone qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '   1. '
-msgid ""
-"If you are trying to start on a USB stick, which program did you use to "
-"install it:"
-msgstr ""
-"Se stai provando ad avviare Tails da una chiave USB, che programma hai usato "
-"per installarla:"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="
+#~ "\"windows qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="
+#~ "\"windows qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '      - '
-#, fuzzy
-#| msgid "<span class=\"application\">GNOME Disks</span>,"
-msgid "<span class=\"application\">Etcher</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="
+#~ "\"mac-usb qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="
+#~ "\"mac-usb qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">GNOME Disks</span>,"
-msgstr "<span class=\"application\">GNOME Disks</span>,"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="
+#~ "\"mac-clone qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="
+#~ "\"mac-clone qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"application\">Tails Installer</span>, or"
-msgstr "<span class=\"application\">Tails Installer</span>, o"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\" "
+#~ "qrcode\" link=\"no\"]]\n"
 
-#. type: Bullet: '      - '
-msgid "<span class=\"command\">dd</span> on the command line?"
-msgstr "<span class=\"command\">dd</span> sulla riga di comando?"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="
+#~ "\"debian qrcode\" link=\"no\"]]\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "      Note that these are the only supported installation methods.\n"
-msgstr "      Nota che queste sono gli unici metodi di installazione supportati.\n"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="
+#~ "\"expert qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="
+#~ "\"expert qrcode\" link=\"no\"]]\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?"
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="
+#~ "\"linux qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="
+#~ "\"linux qrcode\" link=\"no\"]]\n"
 
-#. 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 ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="
+#~ "\"upgrade-clone qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="
+#~ "\"upgrade-clone qrcode\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="
+#~ "\"upgrade-tails qrcode\" link=\"no\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="
+#~ "\"upgrade-tails qrcode\" link=\"no\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class="
+#~ "\"upgrade-clone\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class="
+#~ "\"upgrade-clone\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class="
+#~ "\"debian\"]]\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=\"mac-"
+#~ "dvd\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-"
+#~ "dvd\"]]\n"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" "
+#~ "class=\"upgrade-tails\"]]\n"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/restart-on-upgrade-usb.png link=\"no\" "
+#~ "class=\"upgrade-tails\"]]\n"
+
+#~ msgid ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\"]]\n"
+#~ msgstr ""
+#~ "   [[!img install/inc/screenshots/mac_option_key.png class=\"\" link=\"no"
+#~ "\"]]\n"
+
+#~ msgid ""
+#~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
+#~ "link=\"no\"]]\n"
+#~ msgstr ""
+#~ "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
+#~ "link=\"no\"]]\n"
+
+#~ msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+#~ msgstr "   [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
 
 #~ msgid "<span class=\"application\">Universal USB Installer</span>,"
 #~ msgstr "<span class=\"application\">Universal USB Installer</span>,"
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 9aed0f2d76a500053b345110449d53e4a80d0652..1ff4697f4d7d12debb7713539948dd7a003893b2 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 14:50+0000\n"
+"POT-Creation-Date: 2018-11-11 18:38+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"
@@ -150,7 +150,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"windows linux mac-usb\" alt=\"Computer restarted on USB stick\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -194,7 +194,7 @@ msgid ""
 "   <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
 msgstr ""
 
-#. type: Bullet: '1. '
+#. type: Bullet: '   1. '
 msgid "Switch on the computer."
 msgstr ""
 
@@ -247,195 +247,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   Troubleshooting\n"
-"   ---------------\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!inline pages=\"install/inc/steps/not_at_all.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"bug mac-usb mac-clone\">\n"
-"   <p>If your computer fails to start on the USB stick, then it might\n"
-"   currently be impossible to start Tails on your Mac model.</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"After 30&ndash;60 seconds, another screen called <span class=\"application"
-"\">Tails Greeter</span> appears."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"note\">\n"
-"   <p>If the computer display the error message\n"
-"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
-"   card</span>, refer to our [[list of known issues with graphics\n"
-"   cards|support/known_issues/graphics]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <p>If the computer stops responding or displays other error messages before\n"
-"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
-"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
-"   Tails not starting entirely\"]].</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   <span class=\"hide\">[[!toggle id=\"not_entirely\" text=\"\"]]</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   Tails does not start entirely\n"
-"   -----------------------------\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
-"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "Restart the computer on the first USB stick."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
-"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
-"   which might work better on some computers.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
-"   better, restart the computer again on the first USB stick.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
-"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
-"   of boot options appears at the bottom of the screen.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"Press the <span class=\"keycap\">Backspace</span> key several times to "
-"remove the <span class=\"code\">quiet</span> option from the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"If Tails previously failed to start and displayed the <span class=\"code"
-"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
-"add this option to the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "Type `debug nosplash` to add these options to the command line."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"Hopefully, error messages now appear when starting Tails. You can [[send "
-"them to our support team by email|support/talk]], for example by taking a "
-"picture of the last screen and error messages."
-msgstr ""
-
-#. type: Bullet: '   1. '
-msgid ""
-"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
-"control turned off</span> followed by <span class=\"code\">(initramfs)</"
-"span>, then try removing the <span class=\"code\">live-media=removable</"
-"span> option from the boot command line."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
-"      report the problem to our [[support team|support/talk]].\n"
-"      This contributes to improving the [[list\n"
-"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
-"      Then try installing Tails on another USB stick.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   <div class=\"caution\">\n"
-"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
-"   might be dangerous. If an adversary had access to the computer and\n"
-"   installed a malicious Tails on an internal hard disk, the computer\n"
-"   might start on the malicious Tails instead of on the USB stick.</p>\n"
-"   </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
-"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
-"Click <span class=\"button\">Start Tails</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "After 15&ndash;30 seconds, the Tails desktop appears."
-msgstr "Após 15&ndash;30 segundos, a área de trabalho do Tails aparece."
-
-#. type: Plain text
-#, no-wrap
-msgid "   [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails desktop\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"   Tails does not start at all\n"
-"   ---------------------------\n"
+"   Troubleshooting: Tails does not start at all\n"
+"   --------------------------------------------\n"
 msgstr ""
 
 #. type: Plain text
@@ -757,6 +570,188 @@ msgstr ""
 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
+msgid "     [[!img install/inc/screenshots/tails_boot_menu.png link=\"no\" alt=\"Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'.\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"bug mac-usb mac-clone\">\n"
+"   <p>If your computer fails to start on the USB stick, then it might\n"
+"   currently be impossible to start Tails on your Mac model.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After 30&ndash;60 seconds, another screen called <span class=\"application"
+"\">Tails Greeter</span> appears."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"note\">\n"
+"   <p>If the computer display the error message\n"
+"   <span class=\"guilabel\">Error starting GDM with your graphics\n"
+"   card</span>, refer to our [[list of known issues with graphics\n"
+"   cards|support/known_issues/graphics]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <p>If the computer stops responding or displays other error messages before\n"
+"   getting to <span class=\"application\">Tails Greeter</span>, refer to\n"
+"   [[!toggle id=\"not_entirely\" text=\"the troubleshooting section about\n"
+"   Tails not starting entirely\"]].</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!toggleable id=\"not_entirely\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+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 ""
+"   Tails does not start entirely\n"
+"   -----------------------------\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   The following section applies if the <span class=\"application\">Boot Loader Menu</span> appears but not\n"
+"   <span class=\"application\">Tails Greeter</span> when starting Tails.\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Restart the computer on the first USB stick."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, choose the\n"
+"   <span class=\"guilabel\">Troubleshooting Mode</span>\n"
+"   which might work better on some computers.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. If the <span class=\"guilabel\">Troubleshooting Mode</span> does not work\n"
+"   better, restart the computer again on the first USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   1. In the <span class=\"application\">Boot Loader Menu</span>, press\n"
+"   <span class=\"keycap\">TAB</span>. A command line with a list\n"
+"   of boot options appears at the bottom of the screen.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "      [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=\"no\" alt=\"Black screen with Tails artwork and list of boot options\"]]\n"
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Press the <span class=\"keycap\">Backspace</span> key several times to "
+"remove the <span class=\"code\">quiet</span> option from the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If Tails previously failed to start and displayed the <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
+"add this option to the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "Type `debug nosplash` to add these options to the command line."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid "To start Tails, press <span class=\"keycap\">Enter</span>."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"Hopefully, error messages now appear when starting Tails. You can [[send "
+"them to our support team by email|support/talk]], for example by taking a "
+"picture of the last screen and error messages."
+msgstr ""
+
+#. type: Bullet: '   1. '
+msgid ""
+"If the error message is <span class=\"code\">/bin/sh: can't access tty; job "
+"control turned off</span> followed by <span class=\"code\">(initramfs)</"
+"span>, then try removing the <span class=\"code\">live-media=removable</"
+"span> option from the boot command line."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"      If removing <span class=\"code\">live-media=removable</span> allows you to start Tails, please\n"
+"      report the problem to our [[support team|support/talk]].\n"
+"      This contributes to improving the [[list\n"
+"      of problematic USB sticks|support/known_issues#problematic-usb-sticks]].\n"
+"      Then try installing Tails on another USB stick.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <div class=\"caution\">\n"
+"   <p>Removing the <span class=\"code\">live-media=removable</span> option\n"
+"   might be dangerous. If an adversary had access to the computer and\n"
+"   installed a malicious Tails on an internal hard disk, the computer\n"
+"   might start on the malicious Tails instead of on the USB stick.</p>\n"
+"   </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=\"no\" alt=\"Tails Greeter: 'Welcome to Tails!'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. In <span class=\"application\">Tails Greeter</span>, select your language and\n"
+"keyboard layout in the <span class=\"guilabel\">Language & Region</span> section.\n"
+"Click <span class=\"button\">Start Tails</span>.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "After 15&ndash;30 seconds, the Tails desktop appears."
+msgstr "Após 15&ndash;30 segundos, a área de trabalho do Tails aparece."
+
+#. type: Plain text
+#, 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 "