summaryrefslogtreecommitdiffstats
path: root/wiki/src/upgrade
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-12-07 14:22:40 +0000
committerintrigeri <intrigeri@boum.org>2018-12-07 14:22:40 +0000
commitf867627a53c886385e7f72a3f6d634d55d5051e2 (patch)
tree9d771ffdf5f4cd60f4f8d8b7c8cc038527f8e13d /wiki/src/upgrade
parent9578f8b30145a506ca73936317caed173106472b (diff)
parent867e4d81007307942be5fb797f7b0131a3b2f413 (diff)
Merge branch 'doc/16006-usb-images' into devel
Diffstat (limited to 'wiki/src/upgrade')
-rw-r--r--wiki/src/upgrade/clone.de.po4
-rw-r--r--wiki/src/upgrade/clone.es.po4
-rw-r--r--wiki/src/upgrade/clone.fa.po2
-rw-r--r--wiki/src/upgrade/clone.fr.po4
-rw-r--r--wiki/src/upgrade/clone.it.po4
-rw-r--r--wiki/src/upgrade/clone.mdwn2
-rw-r--r--wiki/src/upgrade/clone.pt.po4
-rw-r--r--wiki/src/upgrade/tails.de.po194
-rwxr-xr-xwiki/src/upgrade/tails.es.po194
-rw-r--r--wiki/src/upgrade/tails.fa.po97
-rw-r--r--wiki/src/upgrade/tails.fr.po198
-rw-r--r--wiki/src/upgrade/tails.it.po193
-rw-r--r--wiki/src/upgrade/tails.mdwn44
-rw-r--r--wiki/src/upgrade/tails.pt.po193
14 files changed, 476 insertions, 661 deletions
diff --git a/wiki/src/upgrade/clone.de.po b/wiki/src/upgrade/clone.de.po
index f716a8c..0da828a 100644
--- a/wiki/src/upgrade/clone.de.po
+++ b/wiki/src/upgrade/clone.de.po
@@ -58,8 +58,8 @@ msgstr "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline.de\" raw=\"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgstr "[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/upgrade/clone.es.po b/wiki/src/upgrade/clone.es.po
index ee9076b..8c27e37 100644
--- a/wiki/src/upgrade/clone.es.po
+++ b/wiki/src/upgrade/clone.es.po
@@ -60,8 +60,8 @@ msgstr "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline.es\" raw=\"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/upgrade/clone.fa.po b/wiki/src/upgrade/clone.fa.po
index a662155..b64d0e5 100644
--- a/wiki/src/upgrade/clone.fa.po
+++ b/wiki/src/upgrade/clone.fa.po
@@ -58,5 +58,5 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
diff --git a/wiki/src/upgrade/clone.fr.po b/wiki/src/upgrade/clone.fr.po
index e169f6c..12eb240 100644
--- a/wiki/src/upgrade/clone.fr.po
+++ b/wiki/src/upgrade/clone.fr.po
@@ -58,8 +58,8 @@ msgstr "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline.fr\" raw=\"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/upgrade/clone.it.po b/wiki/src/upgrade/clone.it.po
index cf1218a..625a467 100644
--- a/wiki/src/upgrade/clone.it.po
+++ b/wiki/src/upgrade/clone.it.po
@@ -59,9 +59,9 @@ msgstr "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline.it\" raw=\"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-"[[!inline pages=\"install/inc/steps/install_final.inline.it\" raw=\"yes\" "
+"[[!inline pages=\"install/inc/steps/clone.inline.it\" raw=\"yes\" "
"sort=\"age\"]]\n"
#~ msgid ""
diff --git a/wiki/src/upgrade/clone.mdwn b/wiki/src/upgrade/clone.mdwn
index 8f421ae..ecf6de0 100644
--- a/wiki/src/upgrade/clone.mdwn
+++ b/wiki/src/upgrade/clone.mdwn
@@ -10,4 +10,4 @@
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes" sort="age"]]
-[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/clone.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/upgrade/clone.pt.po b/wiki/src/upgrade/clone.pt.po
index 97507f2..824761c 100644
--- a/wiki/src/upgrade/clone.pt.po
+++ b/wiki/src/upgrade/clone.pt.po
@@ -60,8 +60,8 @@ msgstr "[[!inline pages=\"install/inc/steps/verify_up-to-date.inline.pt\" raw=\"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/upgrade/tails.de.po b/wiki/src/upgrade/tails.de.po
index 23e5436..e49ca53 100644
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2018-03-16 13:40+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
@@ -81,21 +81,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr "<p>Alle Daten auf diesem USB-Stick werden verlorengehen.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -110,109 +95,111 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Schließen Sie den zwischenzeitlichen USB-Stick an."
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-"1. Wählen Sie\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" um den <span class=\"application\">Tails Installer</span> zu starten.\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid "Close <span class=\"application\">Tails Installer</span>."
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "<p>All the data on this USB stick will be lost.</p>\n"
+#~ msgstr "<p>Alle Daten auf diesem USB-Stick werden verlorengehen.</p>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "Plug the intermediary USB stick in the computer."
+#~ msgstr "Schließen Sie den zwischenzeitlichen USB-Stick an."
+
+#~ msgid ""
+#~ "1. Choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
+#~ msgstr ""
+#~ "1. Wählen Sie\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " um den <span class=\"application\">Tails Installer</span> zu starten.\n"
-#. type: Bullet: '1. '
#, fuzzy
-#| msgid ""
-#| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
-#| "specify the intermediary USB stick."
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-"Benutzen Sie Dropdown-Liste <span class=\"guilabel\">Target Device</span>, "
-"um den zwischenzeitlichen USB-Stick anzugeben."
+#~| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-"Klicken Sie auf die Schaltfläche <span class=\"button\">Install Tails</"
-"span>, um Tails zu installieren."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-"Lesen Sie die Warnmeldung im Bestätigungsfenster. Klicken Sie auf <span "
-"class=\"button\">Yes</span>, um zu bestätigen."
+#, fuzzy
+#~| msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgid ""
+#~ "Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
+#~ msgstr ""
+#~ "Schließen Sie den <span class=\"application\">Tails Installer</span>."
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
-msgstr " Die Installation dauert einige Minuten.\n"
+#, fuzzy
+#~| msgid ""
+#~| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
+#~| "specify the intermediary USB stick."
+#~ msgid ""
+#~ "Use the <span class=\"guilabel\">Target USB stick</span> drop-down list "
+#~ "to specify the intermediary USB stick."
+#~ msgstr ""
+#~ "Benutzen Sie Dropdown-Liste <span class=\"guilabel\">Target Device</"
+#~ "span>, um den zwischenzeitlichen USB-Stick anzugeben."
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-" <div class=\"bug\">\n"
-" <p>Der Fortschrittsbalken friert gewöhnlicherweise bei etwa 95% ein, während\n"
-" die Daten auf das Medium synchronisiert werden.</p>\n"
-" </div>\n"
+#~ msgid ""
+#~ "To start the installation, click on the <span class=\"button\">Install "
+#~ "Tails</span> button."
+#~ msgstr ""
+#~ "Klicken Sie auf die Schaltfläche <span class=\"button\">Install Tails</"
+#~ "span>, um Tails zu installieren."
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
+#~ msgid ""
+#~ "Read the warning message in the confirmation dialog. Click on <span class="
+#~ "\"button\">Yes</span> to confirm."
+#~ msgstr ""
+#~ "Lesen Sie die Warnmeldung im Bestätigungsfenster. Klicken Sie auf <span "
+#~ "class=\"button\">Yes</span>, um zu bestätigen."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid " The installation takes a few minutes.\n"
+#~ msgstr " Die Installation dauert einige Minuten.\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>The progress bar usually freezes for some time around 95 percent\n"
+#~ " while synchronizing data on disk.</p>\n"
+#~ " </div>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>Der Fortschrittsbalken friert gewöhnlicherweise bei etwa 95% ein, während\n"
+#~ " die Daten auf das Medium synchronisiert werden.</p>\n"
+#~ " </div>\n"
+
+#~ msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgstr ""
+#~ "Schließen Sie den <span class=\"application\">Tails Installer</span>."
#~ msgid " <div class=\"bug\">\n"
#~ msgstr " <div class=\"bug\">\n"
@@ -222,7 +209,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid ""
#~ " <li>Start <span class=\"application\">Tails Installer</span> in\n"
#~ " English from the command line:\n"
-#~ msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
+#~ msgstr ""
+#~ "Schließen Sie den <span class=\"application\">Tails Installer</span>."
#~ msgid " </div>\n"
#~ msgstr " </div>\n"
diff --git a/wiki/src/upgrade/tails.es.po b/wiki/src/upgrade/tails.es.po
index 06dcf9b..038b62f 100755
--- a/wiki/src/upgrade/tails.es.po
+++ b/wiki/src/upgrade/tails.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2018-07-11 05:48+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -78,21 +78,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr "<p>Toda la información en esta memoria USB se perderá.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -105,103 +90,103 @@ msgstr "<p>El almacenamiento persistente de tu memoria USB no se copiará.</p>\n
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Conecta la memoria USB intermediaria en la computadora."
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-"1. Elige\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Aplicaciones</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" para iniciar el <span class=\"application\">Tails Installer</span>.\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Instalación por clonación', 'Actualización por cloning', 'Actualizar desde ISO'\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr ""
-"Elige <span class=\"guilabel\">Usa una imagen ISO de Tails descargada</span>."
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-"Usa la lista desplegable de <span class=\"guilabel\">Memoria USB de "
-"destino</span> para especificar la memoria USB intermedia."
+#~ msgid "<p>All the data on this USB stick will be lost.</p>\n"
+#~ msgstr "<p>Toda la información en esta memoria USB se perderá.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-"Para iniciar la instalación, haz click en el botón <span class=\"button"
-"\">Instalar Tails</span>."
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-"Lee el mensaje de advertencia en el cuadro de confirmación. Haz click en "
-"<span class=\"button\">Sí</span> para confirmar."
+#~ msgid "Plug the intermediary USB stick in the computer."
+#~ msgstr "Conecta la memoria USB intermediaria en la computadora."
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
-msgstr " La instalación dura algunos minutos.\n"
+#~ msgid ""
+#~ "1. Choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
+#~ msgstr ""
+#~ "1. Elige\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Aplicaciones</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " para iniciar el <span class=\"application\">Tails Installer</span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-" <div class=\"bug\">\n"
-" <p>La barra de progreso usualmente se congela algo de tiempo alrededor del 95 por ciento\n"
-" mientras sincroniza información en el disco.</p>\n"
-" </div>\n"
+#~ msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Instalación por clonación', 'Actualización por cloning', 'Actualizar desde ISO'\"]]\n"
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Cierra el <span class=\"application\">Tails Installer</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
+#~ msgstr ""
+#~ "Elige <span class=\"guilabel\">Usa una imagen ISO de Tails descargada</"
+#~ "span>."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "Use the <span class=\"guilabel\">Target USB stick</span> drop-down list "
+#~ "to specify the intermediary USB stick."
+#~ msgstr ""
+#~ "Usa la lista desplegable de <span class=\"guilabel\">Memoria USB de "
+#~ "destino</span> para especificar la memoria USB intermedia."
+
+#~ msgid ""
+#~ "To start the installation, click on the <span class=\"button\">Install "
+#~ "Tails</span> button."
+#~ msgstr ""
+#~ "Para iniciar la instalación, haz click en el botón <span class=\"button"
+#~ "\">Instalar Tails</span>."
+
+#~ msgid ""
+#~ "Read the warning message in the confirmation dialog. Click on <span class="
+#~ "\"button\">Yes</span> to confirm."
+#~ msgstr ""
+#~ "Lee el mensaje de advertencia en el cuadro de confirmación. Haz click en "
+#~ "<span class=\"button\">Sí</span> para confirmar."
+
+#~ msgid " The installation takes a few minutes.\n"
+#~ msgstr " La instalación dura algunos minutos.\n"
+
+#~ msgid ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>The progress bar usually freezes for some time around 95 percent\n"
+#~ " while synchronizing data on disk.</p>\n"
+#~ " </div>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>La barra de progreso usualmente se congela algo de tiempo alrededor del 95 por ciento\n"
+#~ " mientras sincroniza información en el disco.</p>\n"
+#~ " </div>\n"
+
+#~ msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgstr "Cierra el <span class=\"application\">Tails Installer</span>."
#~ msgid " <a id=\"3.5\"></a>\n"
#~ msgstr " <a id=\"3.5\"></a>\n"
@@ -210,19 +195,25 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgstr " <div class=\"bug\">\n"
#~ msgid ""
-#~ " <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, it is only possible to select an\n"
+#~ " <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, "
+#~ "it is only possible to select an\n"
#~ " ISO image when running Tails in English. For other languages, the\n"
#~ " file chooser button remains inactive:</p>\n"
#~ msgstr ""
-#~ " <p>Si estás haciendo una actualización manual desde Tails 3.2, 3.3, 3.4, o 3.5, solamente es posible seleccionar una\n"
+#~ " <p>Si estás haciendo una actualización manual desde Tails 3.2, 3.3, "
+#~ "3.4, o 3.5, solamente es posible seleccionar una\n"
#~ " imagen ISO ejecutando Tails en inglés. Para otros lenguajes, el\n"
#~ " botón del selector de archivos permanece inactivo:</p>\n"
#~ msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
#~ msgstr " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
-#~ msgid " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can either:</p>\n"
-#~ msgstr " <p>Para hacer una actualización manual desde Tails 3.2, 3.3, 3.4, o 3.5, puedes:</p>\n"
+#~ msgid ""
+#~ " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can "
+#~ "either:</p>\n"
+#~ msgstr ""
+#~ " <p>Para hacer una actualización manual desde Tails 3.2, 3.3, 3.4, o "
+#~ "3.5, puedes:</p>\n"
#~ msgid ""
#~ " <ul>\n"
@@ -235,7 +226,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ " <li>Start <span class=\"application\">Tails Installer</span> in\n"
#~ " English from the command line:\n"
#~ msgstr ""
-#~ " <li>Iniciar el <span class=\"application\">Tails Installer</span> en\n"
+#~ " <li>Iniciar el <span class=\"application\">Tails Installer</span> "
+#~ "en\n"
#~ " inglés desde la línea de comandos:\n"
#~ msgid ""
diff --git a/wiki/src/upgrade/tails.fa.po b/wiki/src/upgrade/tails.fa.po
index 4583717..3dca260 100644
--- a/wiki/src/upgrade/tails.fa.po
+++ b/wiki/src/upgrade/tails.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2018-03-16 13:44+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
@@ -74,21 +74,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr ""
@@ -101,75 +86,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
+msgid "</div>\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fa\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -178,12 +102,5 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
-
-#~ msgid ""
-#~ " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" "
-#~ "sort=\"age\"]]\n"
-#~ msgstr ""
-#~ " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fa\" raw=\"yes"
-#~ "\" sort=\"age\"]]\n"
diff --git a/wiki/src/upgrade/tails.fr.po b/wiki/src/upgrade/tails.fr.po
index b9b0d3a..66cd2ac 100644
--- a/wiki/src/upgrade/tails.fr.po
+++ b/wiki/src/upgrade/tails.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2018-03-22 02:29+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -76,21 +76,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr "<p>Toutes les données sur la clé USB seront perdus.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -105,104 +90,103 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Brancher la clé USB intermédiaire dans l'ordinateur."
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-"1. Choisir\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Programme d'installation de Tails</span>\n"
-" </span>\n"
-" pour démarrer l'<span class=\"application\">Installeur de Tails</span>.\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Installeur de Tails : 'Installation par clonage', 'Mise à jour par clonage', 'Mise à jour à partir d'une ISO'\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr ""
-"Choisissez <span class=\"guilabel\">Utiliser une image ISO Tails "
-"téléchargée</span>."
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-"Utiliser la liste déroulante <span class=\"guilabel\">Clé USB cible</span> "
-"pour sélectionner la clé USB intermédiaire."
+#~ msgid "<p>All the data on this USB stick will be lost.</p>\n"
+#~ msgstr "<p>Toutes les données sur la clé USB seront perdus.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-"Pour démarrer l'installation, cliquer sur le bouton <span class=\"button"
-"\">Installer Tails</span>."
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-"Lire le message d'avertissement dans la fenêtre de confirmation. Cliquer sur "
-"<span class=\"button\">Oui</span> pour confirmer."
+#~ msgid "Plug the intermediary USB stick in the computer."
+#~ msgstr "Brancher la clé USB intermédiaire dans l'ordinateur."
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
-msgstr " L'installation prend quelques minutes.\n"
+#~ msgid ""
+#~ "1. Choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
+#~ msgstr ""
+#~ "1. Choisir\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Programme d'installation de Tails</span>\n"
+#~ " </span>\n"
+#~ " pour démarrer l'<span class=\"application\">Installeur de Tails</span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-" <div class=\"bug\">\n"
-" <p>La barre de progression se fige généralement pendant quelques instants aux alentours des 95 pourcents\n"
-" pendant la synchronisation des données sur le disque.</p>\n"
-" </div>\n"
+#~ msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Installeur de Tails : 'Installation par clonage', 'Mise à jour par clonage', 'Mise à jour à partir d'une ISO'\"]]\n"
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Fermer l'<span class=\"application\">Installeur de Tails</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
+#~ msgstr ""
+#~ "Choisissez <span class=\"guilabel\">Utiliser une image ISO Tails "
+#~ "téléchargée</span>."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "Use the <span class=\"guilabel\">Target USB stick</span> drop-down list "
+#~ "to specify the intermediary USB stick."
+#~ msgstr ""
+#~ "Utiliser la liste déroulante <span class=\"guilabel\">Clé USB cible</"
+#~ "span> pour sélectionner la clé USB intermédiaire."
+
+#~ msgid ""
+#~ "To start the installation, click on the <span class=\"button\">Install "
+#~ "Tails</span> button."
+#~ msgstr ""
+#~ "Pour démarrer l'installation, cliquer sur le bouton <span class=\"button"
+#~ "\">Installer Tails</span>."
+
+#~ msgid ""
+#~ "Read the warning message in the confirmation dialog. Click on <span class="
+#~ "\"button\">Yes</span> to confirm."
+#~ msgstr ""
+#~ "Lire le message d'avertissement dans la fenêtre de confirmation. Cliquer "
+#~ "sur <span class=\"button\">Oui</span> pour confirmer."
+
+#~ msgid " The installation takes a few minutes.\n"
+#~ msgstr " L'installation prend quelques minutes.\n"
+
+#~ msgid ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>The progress bar usually freezes for some time around 95 percent\n"
+#~ " while synchronizing data on disk.</p>\n"
+#~ " </div>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>La barre de progression se fige généralement pendant quelques instants aux alentours des 95 pourcents\n"
+#~ " pendant la synchronisation des données sur le disque.</p>\n"
+#~ " </div>\n"
+
+#~ msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgstr "Fermer l'<span class=\"application\">Installeur de Tails</span>."
#~ msgid " <a id=\"3.5\"></a>\n"
#~ msgstr " <a id=\"3.5\"></a>\n"
@@ -211,19 +195,26 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgstr " <div class=\"bug\">\n"
#~ msgid ""
-#~ " <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, it is only possible to select an\n"
+#~ " <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, "
+#~ "it is only possible to select an\n"
#~ " ISO image when running Tails in English. For other languages, the\n"
#~ " file chooser button remains inactive:</p>\n"
#~ msgstr ""
-#~ " <p>Si vous faites une mise à jour manuelle depuis Tails 3.2, 3.3, 3.4 ou 3.5, il est possible de sélectionner une\n"
-#~ " image ISO seulement lorsque le Tails lancé est en anglais. Pour les autres langues, le\n"
+#~ " <p>Si vous faites une mise à jour manuelle depuis Tails 3.2, 3.3, 3.4 "
+#~ "ou 3.5, il est possible de sélectionner une\n"
+#~ " image ISO seulement lorsque le Tails lancé est en anglais. Pour les "
+#~ "autres langues, le\n"
#~ " bouton de sélection de fichier reste inactif :</p>\n"
#~ msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
#~ msgstr " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
-#~ msgid " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can either:</p>\n"
-#~ msgstr " <p>Pour faire une mise à jour manuelle depuis Tails 3.2, 3.3, 3.4 ou 3.5, vous pouvez au choix :</p>\n"
+#~ msgid ""
+#~ " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can "
+#~ "either:</p>\n"
+#~ msgstr ""
+#~ " <p>Pour faire une mise à jour manuelle depuis Tails 3.2, 3.3, 3.4 ou "
+#~ "3.5, vous pouvez au choix :</p>\n"
#~ msgid ""
#~ " <ul>\n"
@@ -236,7 +227,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ " <li>Start <span class=\"application\">Tails Installer</span> in\n"
#~ " English from the command line:\n"
#~ msgstr ""
-#~ " <li>Démarrer l'<span class=\"application\">Installeur de Tails</span> en\n"
+#~ " <li>Démarrer l'<span class=\"application\">Installeur de Tails</"
+#~ "span> en\n"
#~ " anglais depuis la ligne de commande :\n"
#~ msgid ""
diff --git a/wiki/src/upgrade/tails.it.po b/wiki/src/upgrade/tails.it.po
index 3eed34e..3c39f23 100644
--- a/wiki/src/upgrade/tails.it.po
+++ b/wiki/src/upgrade/tails.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2016-08-25 18:00-0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -80,21 +80,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr "<p>Tutti i dati in questa pennetta USB saranno persi.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -109,113 +94,109 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Inserisci la pennetta USB intermediaria nel computer."
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-"1. Scegli\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]\n"
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid "Close <span class=\"application\">Tails Installer</span>."
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "<p>All the data on this USB stick will be lost.</p>\n"
+#~ msgstr "<p>Tutti i dati in questa pennetta USB saranno persi.</p>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "Plug the intermediary USB stick in the computer."
+#~ msgstr "Inserisci la pennetta USB intermediaria nel computer."
+
+#~ msgid ""
+#~ "1. Choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
+#~ msgstr ""
+#~ "1. Scegli\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
-#. type: Bullet: '1. '
#, fuzzy
-#| msgid ""
-#| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
-#| "specify the intermediary USB stick."
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-"Use il menu a tendina <span class=\"guilabel\">Target Device</span> per "
-"specificare la chiavetta USB intermediaria."
+#~| msgid "[[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgstr "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]\n"
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-"Per iniziare l'installazione, clicca sul bottone <span class=\"button"
-"\">Installa Tails</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-"Leggi il messaggio di avviso nella finestra di conferma. Clicca su <span "
-"class=\"button\">Si</span> per confermare."
+#, fuzzy
+#~| msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgid ""
+#~ "Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
+#~ msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
-msgstr " L'installazione durerà qualche minuto.\n"
+#, fuzzy
+#~| msgid ""
+#~| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
+#~| "specify the intermediary USB stick."
+#~ msgid ""
+#~ "Use the <span class=\"guilabel\">Target USB stick</span> drop-down list "
+#~ "to specify the intermediary USB stick."
+#~ msgstr ""
+#~ "Use il menu a tendina <span class=\"guilabel\">Target Device</span> per "
+#~ "specificare la chiavetta USB intermediaria."
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-" <div class=\"bug\">\n"
-" <p>La barra di progressione normalmente si blocca per qualche tempo su 95 per cento\n"
-" mentre si stanno sincronizzando i dati sul disco.</p>\n"
-" </div>\n"
+#~ msgid ""
+#~ "To start the installation, click on the <span class=\"button\">Install "
+#~ "Tails</span> button."
+#~ msgstr ""
+#~ "Per iniziare l'installazione, clicca sul bottone <span class=\"button"
+#~ "\">Installa Tails</span>."
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
+#~ msgid ""
+#~ "Read the warning message in the confirmation dialog. Click on <span class="
+#~ "\"button\">Yes</span> to confirm."
+#~ msgstr ""
+#~ "Leggi il messaggio di avviso nella finestra di conferma. Clicca su <span "
+#~ "class=\"button\">Si</span> per confermare."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/restart_first_time.inline.it\" raw=\""
-"yes\" sort=\"age\"]]\n"
+#~ msgid " The installation takes a few minutes.\n"
+#~ msgstr " L'installazione durerà qualche minuto.\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/install_final.inline.it\" raw=\"yes\" "
-"sort=\"age\"]]\n"
+#~ msgid ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>The progress bar usually freezes for some time around 95 percent\n"
+#~ " while synchronizing data on disk.</p>\n"
+#~ " </div>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>La barra di progressione normalmente si blocca per qualche tempo su 95 per cento\n"
+#~ " mentre si stanno sincronizzando i dati sul disco.</p>\n"
+#~ " </div>\n"
+
+#~ msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
#~ msgid " <div class=\"bug\">\n"
#~ msgstr " <div class=\"bug\">\n"
diff --git a/wiki/src/upgrade/tails.mdwn b/wiki/src/upgrade/tails.mdwn
index 483191b..2739bd9 100644
--- a/wiki/src/upgrade/tails.mdwn
+++ b/wiki/src/upgrade/tails.mdwn
@@ -18,12 +18,6 @@ Install an intermediary Tails
In this step, you will install an intermediary Tails using the Tails ISO
image that you downloaded earlier.
-<div class="caution">
-
-<p>All the data on this USB stick will be lost.</p>
-
-</div>
-
<div class="note">
<p>The persistent storage of your Tails USB stick will not be
@@ -31,42 +25,8 @@ copied.</p>
</div>
-<div class="step-image">[[!img install/inc/infography/plug-upgrade-usb.png link="no" alt=""]]</div>
-
-1. Plug the intermediary USB stick in the computer.
-
-1. Choose
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Tails</span>&nbsp;▸
- <span class="guimenuitem">Tails Installer</span>
- </span>
- to start <span class="application">Tails Installer</span>.
-
- [[!img install/inc/screenshots/tails_installer_in_tails.png link="no" alt="Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'"]]
-
- <div class="step-image">[[!img install/inc/infography/install-upgrade-usb.png link="no" alt=""]]</div>
-
-1. Choose <span class="guilabel">Use a downloaded Tails ISO
- image</span>.
-
-1. Use the <span class="guilabel">Target USB stick</span> drop-down list to
- specify the intermediary USB stick.
-
-1. To start the installation, click on the <span class="button">Install Tails</span> button.
-
-1. Read the warning message in the confirmation dialog. Click
- on <span class="button">Yes</span> to confirm.
-
- The installation takes a few minutes.
-
- <div class="bug">
- <p>The progress bar usually freezes for some time around 95 percent
- while synchronizing data on disk.</p>
- </div>
-
-1. Close <span class="application">Tails Installer</span>.
+[[!inline pages="install/inc/steps/install_with_gnome_disks.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
-[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/clone.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/upgrade/tails.pt.po b/wiki/src/upgrade/tails.pt.po
index 67d0e18..f23681f 100644
--- a/wiki/src/upgrade/tails.pt.po
+++ b/wiki/src/upgrade/tails.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-26 13:30+0200\n"
+"POT-Creation-Date: 2018-11-07 15:43+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -78,21 +78,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>All the data on this USB stick will be lost.</p>\n"
-msgstr "<p>Todos os dados nesta unidade USB serão perdidos.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -107,113 +92,113 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Insira a unidade USB intermediária no computador."
+msgid "</div>\n"
+msgstr "</div>\n"
-# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Tails Installer</span>.\n"
-msgstr ""
-"1. Selecione\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Aplicativos</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails Installer</span>\n"
-" </span>\n"
-" para iniciar o <span class=\"application\">Tails Installer</span>.\n"
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
+#, no-wrap
+msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/clone.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/clone.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "<div class=\"caution\">\n"
+#~ msgstr "<div class=\"caution\">\n"
+
+#~ msgid "<p>All the data on this USB stick will be lost.</p>\n"
+#~ msgstr "<p>Todos os dados nesta unidade USB serão perdidos.</p>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "Plug the intermediary USB stick in the computer."
+#~ msgstr "Insira a unidade USB intermediária no computador."
+
+# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
+#~ msgid ""
+#~ "1. Choose\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " to start <span class=\"application\">Tails Installer</span>.\n"
+#~ msgstr ""
+#~ "1. Selecione\n"
+#~ " <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Aplicativos</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
+#~ " </span>\n"
+#~ " para iniciar o <span class=\"application\">Tails Installer</span>.\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\"]]\n"
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
-#. type: Bullet: '1. '
#, fuzzy
-#| msgid "Close <span class=\"application\">Tails Installer</span>."
-msgid ""
-"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
-msgstr "Feche o <span class=\"application\">Tails Installer</span>."
+#~| msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgid ""
+#~ "Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
+#~ msgstr "Feche o <span class=\"application\">Tails Installer</span>."
-#. type: Bullet: '1. '
#, fuzzy
-#| msgid ""
-#| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
-#| "specify the intermediary USB stick."
-msgid ""
-"Use the <span class=\"guilabel\">Target USB stick</span> drop-down list to "
-"specify the intermediary USB stick."
-msgstr ""
-"Use a lista <span class=\"guilabel\">Dispositivo de destino</span> para "
-"especificar a unidade USB intermediária."
+#~| msgid ""
+#~| "Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
+#~| "specify the intermediary USB stick."
+#~ msgid ""
+#~ "Use the <span class=\"guilabel\">Target USB stick</span> drop-down list "
+#~ "to specify the intermediary USB stick."
+#~ msgstr ""
+#~ "Use a lista <span class=\"guilabel\">Dispositivo de destino</span> para "
+#~ "especificar a unidade USB intermediária."
-#. type: Bullet: '1. '
-msgid ""
-"To start the installation, click on the <span class=\"button\">Install "
-"Tails</span> button."
-msgstr ""
-"Para iniciar a instalação, clique no botão <span class=\"button\">Instalar "
-"Tails</span>."
+#~ msgid ""
+#~ "To start the installation, click on the <span class=\"button\">Install "
+#~ "Tails</span> button."
+#~ msgstr ""
+#~ "Para iniciar a instalação, clique no botão <span class=\"button"
+#~ "\">Instalar Tails</span>."
# Mantive "Yes" porque é assim que o botão é exibido.
-#. type: Bullet: '1. '
-msgid ""
-"Read the warning message in the confirmation dialog. Click on <span class="
-"\"button\">Yes</span> to confirm."
-msgstr ""
-"Leia a mensagem de aviso no diálogo de confirmação. Clique em <span class="
-"\"button\">Yes</span> para confirmar."
+#~ msgid ""
+#~ "Read the warning message in the confirmation dialog. Click on <span class="
+#~ "\"button\">Yes</span> to confirm."
+#~ msgstr ""
+#~ "Leia a mensagem de aviso no diálogo de confirmação. Clique em <span class="
+#~ "\"button\">Yes</span> para confirmar."
-#. type: Plain text
-#, no-wrap
-msgid " The installation takes a few minutes.\n"
-msgstr " A instalação leva alguns minutos.\n"
+#~ msgid " The installation takes a few minutes.\n"
+#~ msgstr " A instalação leva alguns minutos.\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\">\n"
-" <p>The progress bar usually freezes for some time around 95 percent\n"
-" while synchronizing data on disk.</p>\n"
-" </div>\n"
-msgstr ""
-" <div class=\"bug\">\n"
-" <p>A barra de progresso às vezes congela por algum tempo na altura dos 95 por cento\n"
-" enquanto os dados são sincronizados no disco.</p>\n"
-" </div>\n"
+#~ msgid ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>The progress bar usually freezes for some time around 95 percent\n"
+#~ " while synchronizing data on disk.</p>\n"
+#~ " </div>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\">\n"
+#~ " <p>A barra de progresso às vezes congela por algum tempo na altura dos 95 por cento\n"
+#~ " enquanto os dados são sincronizados no disco.</p>\n"
+#~ " </div>\n"
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Feche o <span class=\"application\">Tails Installer</span>."
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "Close <span class=\"application\">Tails Installer</span>."
+#~ msgstr "Feche o <span class=\"application\">Tails Installer</span>."
#~ msgid " <a id=\"3.5\"></a>\n"
#~ msgstr " <a id=\"3.5\"></a>\n"