summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-09-10 16:34:41 +0000
committersajolida <sajolida@pimienta.org>2018-09-10 16:34:41 +0000
commitad43eedd2c8cdf49fa8d460056dfe1c078baaf17 (patch)
tree0eb5790a74aeef2f3e5489724d41147540d1c2c6
parent9db97decda1607433102f03522a653519c6413bb (diff)
Update PO files
-rw-r--r--wiki/src/doc.de.po27
-rw-r--r--wiki/src/doc.es.po33
-rw-r--r--wiki/src/doc.fa.po8
-rw-r--r--wiki/src/doc.fr.po27
-rw-r--r--wiki/src/doc.it.po22
-rw-r--r--wiki/src/doc.pt.po30
-rw-r--r--wiki/src/install/expert/usb.de.po9
-rw-r--r--wiki/src/install/expert/usb.es.po9
-rw-r--r--wiki/src/install/expert/usb.fa.po4
-rw-r--r--wiki/src/install/expert/usb.fr.po9
-rw-r--r--wiki/src/install/expert/usb.it.po9
-rw-r--r--wiki/src/install/expert/usb.pt.po4
-rw-r--r--wiki/src/install/inc/overview.es.po250
-rw-r--r--wiki/src/install/inc/overview.fa.po111
-rw-r--r--wiki/src/install/inc/overview.fr.po256
-rw-r--r--wiki/src/install/inc/overview.it.po205
-rw-r--r--wiki/src/install/inc/overview.pt.po271
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.de.po78
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.es.po56
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fa.po29
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fr.po56
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.it.po32
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.pt.po78
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po83
-rw-r--r--wiki/src/install/inc/steps/download.inline.es.po196
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po83
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po191
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po83
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po83
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po107
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.es.po84
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po36
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po77
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.it.po77
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po76
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po479
-rwxr-xr-xwiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po463
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po224
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po454
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po476
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po133
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po79
-rwxr-xr-xwiki/src/install/inc/steps/restart_first_time.inline.es.po120
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po30
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po100
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.it.po152
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po33
-rw-r--r--wiki/src/install/linux/usb.de.po479
-rwxr-xr-xwiki/src/install/linux/usb.es.po454
-rw-r--r--wiki/src/install/linux/usb.fa.po219
-rw-r--r--wiki/src/install/linux/usb.fr.po444
-rw-r--r--wiki/src/install/linux/usb.it.po473
-rw-r--r--wiki/src/install/linux/usb.pt.po230
-rw-r--r--wiki/src/upgrade/tails.de.po166
-rwxr-xr-xwiki/src/upgrade/tails.es.po174
-rw-r--r--wiki/src/upgrade/tails.fa.po78
-rw-r--r--wiki/src/upgrade/tails.fr.po170
-rw-r--r--wiki/src/upgrade/tails.it.po161
-rw-r--r--wiki/src/upgrade/tails.pt.po165
59 files changed, 4019 insertions, 4726 deletions
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index 6ccac94..4161701 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails website\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-21 15:59+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -84,20 +84,18 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Installation unter Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Von Debian, Ubuntu oder Mint aus installieren|install/debian/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
+msgstr "[[Installation unter Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
msgid ""
"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
"install/expert/usb-overview]]"
-msgstr "[[Installation von Debian, Ubuntu oder Mint aus unter Nutzung der Kommandozeile und GnuPG|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
msgstr ""
-"[[Von anderen Linux-Distributionen aus installieren|install/linux/usb-"
-"overview]]"
+"[[Installation von Debian, Ubuntu oder Mint aus unter Nutzung der "
+"Kommandozeile und GnuPG|install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
@@ -168,3 +166,14 @@ msgstr "Fortgeschrittene Themen"
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Von Debian, Ubuntu oder Mint aus installieren|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Von anderen Linux-Distributionen aus installieren|install/linux/usb-"
+#~ "overview]]"
diff --git a/wiki/src/doc.es.po b/wiki/src/doc.es.po
index 010035a..0171bf3 100644
--- a/wiki/src/doc.es.po
+++ b/wiki/src/doc.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-01-30 12:41+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-13 09:18+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/doc/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/doc/"
+"es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,8 +47,8 @@ msgid ""
"Read about how you can help [[improving Tails documentation|/contribute/how/"
"documentation]]."
msgstr ""
-"Lee como ayudar a [[mejorar la documentación de "
-"Tails|/contribute/how/documentation]]."
+"Lee como ayudar a [[mejorar la documentación de Tails|/contribute/how/"
+"documentation]]."
#. type: Plain text
msgid "- [[Introduction to this documentation|introduction]]"
@@ -82,21 +82,18 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Instala desde Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Instala desde Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
+msgstr "[[Instala desde Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
msgid ""
"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
"install/expert/usb-overview]]"
msgstr ""
-"[[Instala desde Debian, Ubuntu o Mint usando la línea de comandos y "
-"GnuPG|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Instala desde otras distribuciones de Linux|install/linux/usb-overview]]"
+"[[Instala desde Debian, Ubuntu o Mint usando la línea de comandos y GnuPG|"
+"install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
@@ -166,6 +163,14 @@ msgstr "Temas avanzados"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr "[[Instala desde Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instala desde otras distribuciones de Linux|install/linux/usb-overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr "[[Baja y verifica usando OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.fa.po b/wiki/src/doc.fa.po
index 926f9b6..9c9f6fc 100644
--- a/wiki/src/doc.fa.po
+++ b/wiki/src/doc.fa.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: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2015-10-20 21:45+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/doc/fa/"
@@ -82,7 +82,7 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
@@ -92,10 +92,6 @@ msgid ""
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-
-#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
msgstr ""
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 29cb9e0..fd5db24 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-11-06 15:18-0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -81,10 +81,10 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Installation à partir de Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr ""
-"[[Installation à partir de Debian, Ubuntu ou Mint|install/debian/usb-"
-"overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
+msgstr "[[Installation à partir de Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
msgid ""
@@ -95,12 +95,6 @@ msgstr ""
"et GnuPG|install/expert/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Installation à partir d'une autre distribution Linux|install/linux/usb-"
-"overview]]"
-
-#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
msgstr ""
"[[Installation à partir de macOS en gravant d'abord un DVD|install/mac/dvd-"
@@ -169,6 +163,17 @@ msgstr "Sujets avancés"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installation à partir de Debian, Ubuntu ou Mint|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installation à partir d'une autre distribution Linux|install/linux/usb-"
+#~ "overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr ""
#~ "[[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.it.po b/wiki/src/doc.it.po
index 5523df0..80e8e6b 100644
--- a/wiki/src/doc.it.po
+++ b/wiki/src/doc.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-06-29 09:56+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -80,8 +80,10 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Installa da Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Installa da Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
+msgstr "[[Installa da Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
msgid ""
@@ -92,11 +94,6 @@ msgstr ""
"expert/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Installa da un'altra distribuzione GNU/Linux|install/linux/usb-overview]]"
-
-#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
msgstr "[[Installa da macOS masterizzandoti un DVD|install/mac/dvd-overview]]"
@@ -162,6 +159,15 @@ msgstr "Argomenti avanzati"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.it\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr "[[Installa da Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installa da un'altra distribuzione GNU/Linux|install/linux/usb-"
+#~ "overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr "[[Scarica e verifica con OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 2ec854e..9400ce5 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-08 15:01-0300\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -85,23 +85,18 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Instale a partir de um Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr ""
-"[[Instale a partir de um Debian, Ubuntu ou Mint|install/debian/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux|install/linux/usb-overview]]"
+msgstr "[[Instale a partir de um Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
msgid ""
"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
"install/expert/usb-overview]]"
msgstr ""
-"[[Instale a partir de um Debian, Ubuntu ou Mint usando a linha de "
-"comando|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Instale a partir de outras distribuições de Linux|install/linux/usb-"
-"overview]]"
+"[[Instale a partir de um Debian, Ubuntu ou Mint usando a linha de comando|"
+"install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
@@ -173,6 +168,17 @@ msgstr "Tópicos avançados"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.pt\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instale a partir de um Debian, Ubuntu ou Mint|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instale a partir de outras distribuições de Linux|install/linux/usb-"
+#~ "overview]]"
+
#, fuzzy
#~| msgid "[[Download the ISO image|download#index2h1]]"
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index 11a8528..a59c9ab 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -404,9 +404,12 @@ msgid "If you are running:"
msgstr "Unter:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. Debian, execute the following command to add the\n"
+#| " backports repository to your system:\n"
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
" a. Debian, führen Sie folgenden Befehl aus, um die\n"
diff --git a/wiki/src/install/expert/usb.es.po b/wiki/src/install/expert/usb.es.po
index 032b16d..4730243 100644
--- a/wiki/src/install/expert/usb.es.po
+++ b/wiki/src/install/expert/usb.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-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -399,9 +399,12 @@ msgid "If you are running:"
msgstr "Si estás corriendo:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. Debian, execute the following command to add the\n"
+#| " backports repository to your system:\n"
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
" a. Debian, ejecuta el siguiente comando para agregar el\n"
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index b0262d1..2fa8844 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -320,7 +320,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index 50edc07..330e858 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-20 11:21+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -395,9 +395,12 @@ msgid "If you are running:"
msgstr "Si vous utilisez :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. Debian, execute the following command to add the\n"
+#| " backports repository to your system:\n"
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
" a. Debian, exécutez la commande suivante pour ajouter le\n"
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index d8bb911..66f379d 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -393,9 +393,12 @@ msgid "If you are running:"
msgstr "Se stai usando:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. Debian, execute the following command to add the\n"
+#| " backports repository to your system:\n"
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
" a. Debian, esegui il seguente comando per aggiungere il\n"
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index 6cfacde..a304a53 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.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-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
@@ -326,7 +326,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" a. Debian, execute the following command to add the\n"
+" a. Debian, execute the following commands to add the\n"
" backports repository to your system:\n"
msgstr ""
diff --git a/wiki/src/install/inc/overview.es.po b/wiki/src/install/inc/overview.es.po
index 50ee70c..835f1f2 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-08-20 17:33+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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,17 +30,16 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
#, fuzzy
#| msgid ""
#| "<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> "
-#| "<span class=\"expert\">1½ hour in total</span> <span class="
-#| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#| "span>"
+#| "<span class=\"expert\">1½ hour in total</span> <span class=\"install-clone"
+#| "\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> <span "
-"class=\"expert upgrade-tails\">1½ hour in total</span> <span class="
-"\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\">1½ hours "
+"in total</span> <span class=\"install-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 horas en total</span> <span "
-"class=\"expert\">1½ hora en total</span> <span class=\"install-clone"
-"\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</span>"
+"class=\"expert\">1½ hora en total</span> <span class=\"install-clone\">½ "
+"hora</span> <span class=\"upgrade-clone\">¼ hora</span>"
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
@@ -53,16 +52,21 @@ msgstr ""
"\"]] para descargar</small>"
#. type: Content of: <div><div><div><div><div><h4>
+#, fuzzy
+#| msgid ""
+#| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+#| "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+#| "small></span>"
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-"install</small></span> <span class=\"expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+"</span> <span class=\"windows linux mac-usb mac-dvd expert\"><small>½ hour "
+"to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para "
-"instalar</small></span> <span class=\"expert\"><small>½ hora para "
-"instalar</small></span> <span class=\"upgrade-tails\"><small>½ hora para "
-"actualizar</small></span>"
+"instalar</small></span> <span class=\"expert\"><small>½ hora para instalar</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hora para actualizar</"
+"small></span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
@@ -84,44 +88,22 @@ msgstr "1 otro Tails"
msgid "<small>DVD or USB</small>"
msgstr "<small>DVD o USB</small>"
-#. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "2 USB sticks"
-msgstr "2 memorias USB"
+msgid "1 USB stick"
+msgstr "1 memoria USB"
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>8 GB minimum</small>"
msgstr "<small>8 GB mínimo</small>"
-#. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!"
-msgstr "<small>¡Se perderá toda la información!"
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
-msgstr "[[!toggle id=\"why_two\" text=\"Por qué 2?\"]]</small>"
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-msgstr ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "1 USB stick"
-msgstr "1 memoria USB"
-
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>All data will be lost!</small>"
msgstr "<small>¡Se perderá toda la información!</small>"
+#. type: Content of: <div><div><div><div><div><h4><small>
+msgid "<small>All data will be lost!"
+msgstr "<small>¡Se perderá toda la información!"
+
#. type: Content of: <div><div><div><div><div><h4>
msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
msgstr "[[!toggle id=\"why_extra\" text=\"¿Por qué?\"]]</small>"
@@ -168,31 +150,7 @@ msgstr "para seguir las instrucciones </small>"
msgid "Your steps"
msgstr "Tus pasos"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"First you will <span class=\"windows linux mac-usb\">install an intermediary "
-"Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn an "
-"intermediary Tails on a DVD.</span> <span class=\"expert\">install a "
-"Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
-"\">grabar un Tails intermediario en un DVD.</span> <span class=\""
-"expert\">instalar Tails en tu memoria USB.</span> <span class=\"install-"
-"clone upgrade-clone\">reiniciar en el otro Tails.</span> <span class="
-"\"upgrade-tails\">instalar un Tails intermediario.</span>"
-
-#. type: Content of: <div><ol><li>
-msgid ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
-msgstr ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"¿Por qué un Tails intermedio?\"]]</small></span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
"image downloaded and verified\"]]"
@@ -200,11 +158,23 @@ msgstr ""
"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
"\"imagen ISO descargada y verificada\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Download"
msgstr "Descargar"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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-in-tails.png link=\"no\" "
+"alt=\"ISO image downloaded and verified\"]]"
+msgstr ""
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+"\"imagen ISO descargada y verificada\"]]"
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Computer restarted on USB stick on the left\"]]"
@@ -212,23 +182,27 @@ msgstr ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Computadora reiniciada en memoria USB a la derecha\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Restart"
msgstr "Reiniciar"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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-intermediary-tails.png link=\"no\" alt="
-"\"ISO image installed on USB stick on the left\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
msgstr ""
-"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt="
+"[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
"\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Install"
msgstr "Instalar"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
"image installed on USB stick on the left\"]]"
@@ -236,7 +210,11 @@ msgstr ""
"[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt="
"\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div><p>
+msgid "Install intermediary"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inserted"
"\"]]"
@@ -244,26 +222,11 @@ msgstr ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD insertado"
"\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
-"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
-"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
-"on your USB stick.</span> <span class=\"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=\"mac-dvd\">instalarás "
-"la versión final de Tails tu memoria USB.</span> <span class=\"install-clone"
-"\">instalarás Tails en tu memoria USB.</span> <span class=\"expert"
-"\">lo configurarás.</span> <span class=\"upgrade-clone upgrade-tails"
-"\">actualizarás tu Tails.</span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails installed on USB stick on the right\"]]"
@@ -271,15 +234,19 @@ msgstr ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails instalado en una memoria USB a la derecha\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
+#| "class=\"upgrade\">Upgrade</span>"
msgid ""
-"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
-"class=\"upgrade\">Upgrade</span>"
+"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
+"\">Upgrade</span>"
msgstr ""
"<span class=\"install-clone windows linux mac-usb\">Instalar</span> <span "
"class=\"upgrade\">Actualizar</span>"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
"installed on USB stick on the right\"]]"
@@ -287,7 +254,7 @@ msgstr ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
"instalado en el USB stick a la derecha\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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\"]]"
@@ -295,26 +262,89 @@ msgstr ""
"[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
"\"Cifrado configurado en una memoria USB a la derecha\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Configure"
msgstr "Configurar"
+#~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+#~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+
+#~ msgid "2 USB sticks"
+#~ msgstr "2 memorias USB"
+
+#~ msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
+#~ msgstr "[[!toggle id=\"why_two\" text=\"Por qué 2?\"]]</small>"
+
+#~ msgid ""
+#~ "[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
+#~ "\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" "
+#~ "sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
+#~ "\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" "
+#~ "sort=\"age\"]] \"\"\"]]"
+
+#~ msgid ""
+#~ "First you will <span class=\"windows linux mac-usb\">install an "
+#~ "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
+#~ "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~ "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
+#~ "\">grabar un Tails intermediario en un DVD.</span> <span class=\"expert"
+#~ "\">instalar Tails en tu memoria USB.</span> <span class=\"install-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 mac-dvd upgrade-tails\"><small>[[!"
+#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
+#~ msgstr ""
+#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!"
+#~ "toggle id=\"why_two\" text=\"¿Por qué un Tails intermedio?\"]]</small></"
+#~ "span>"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#~ "alt=\"ISO image installed on USB stick on the left\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Imagen ISO instalada en una memoria USB a la izquierda\"]]"
+
+#~ msgid ""
+#~ "Then you will <span class=\"windows linux mac-usb\">install the final "
+#~ "Tails on the second USB stick.</span> <span class=\"mac-dvd\">install the "
+#~ "final Tails on your USB stick.</span> <span class=\"install-clone"
+#~ "\">install Tails on your USB stick.</span> <span class=\"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=\"mac-dvd"
+#~ "\">instalarás la versión final de Tails tu memoria USB.</span> <span "
+#~ "class=\"install-clone\">instalarás Tails en tu memoria USB.</span> <span "
+#~ "class=\"expert\">lo configurarás.</span> <span class=\"upgrade-clone "
+#~ "upgrade-tails\">actualizarás tu Tails.</span>"
+
#~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in "
-#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span "
-#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
-#~ "hour</span>"
+#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
+#~ "span>"
#~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 horas en "
-#~ "total</span> <span class=\"expert\">1½ hora en total</span> <span "
-#~ "class=\"install-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ "
-#~ "hora</span>"
+#~ "total</span> <span class=\"expert\">1½ hora en total</span> <span class="
+#~ "\"install-clone\">½ hora</span> <span class=\"upgrade-clone\">¼ hora</"
+#~ "span>"
#~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-#~ "install</small></span> <span class=\"expert\"><small>½ hour to "
-#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
-#~ "upgrade</small></span>"
+#~ "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#~ "small></span> <span class=\"upgrade-tails\"><small>¼ hour to upgrade</"
+#~ "small></span>"
#~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para "
#~ "instalar</small></span> <span class=\"expert\"><small>½ hora para "
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index eae2872..b41c518 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-08-20 17:33+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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,9 +26,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> <span "
-"class=\"expert upgrade-tails\">1½ hour in total</span> <span class="
-"\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\">1½ hours "
+"in total</span> <span class=\"install-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -40,9 +40,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-"install</small></span> <span class=\"expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+"</span> <span class=\"windows linux mac-usb mac-dvd expert\"><small>½ hour "
+"to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
@@ -66,39 +65,20 @@ msgstr ""
msgid "<small>DVD or USB</small>"
msgstr ""
-#. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-msgstr ""
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "2 USB sticks"
+msgid "1 USB stick"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>8 GB minimum</small>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!"
-msgstr ""
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "1 USB stick"
+msgid "<small>All data will be lost!</small>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>All data will be lost!</small>"
+#. type: Content of: <div><div><div><div><div><h4><small>
+msgid "<small>All data will be lost!"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
@@ -144,101 +124,86 @@ msgstr ""
msgid "Your steps"
msgstr ""
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"First you will <span class=\"windows linux mac-usb\">install an intermediary "
-"Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn an "
-"intermediary Tails on a DVD.</span> <span class=\"expert\">install a "
-"Tails on your USB stick.</span> <span class=\"install-clone upgrade-clone"
-"\">restart on the other Tails.</span> <span class=\"upgrade-tails\">install "
-"an intermediary Tails.</span>"
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-msgid ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
-msgstr ""
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
"image downloaded and verified\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Download"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Computer restarted on USB stick on the left\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Restart"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt="
-"\"ISO image installed on USB stick on the left\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Install"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
"image installed on USB stick on the left\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div><p>
+msgid "Install intermediary"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inserted"
"\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
-"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
-"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
-"on your USB stick.</span> <span class=\"expert\">configure it.</span> "
-"<span class=\"upgrade-clone upgrade-tails\">upgrade your Tails.</span>"
-msgstr ""
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails installed on USB stick on the right\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid ""
-"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
-"class=\"upgrade\">Upgrade</span>"
+"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
+"\">Upgrade</span>"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
"installed on USB stick on the right\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Configure"
msgstr ""
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index bb5896a..8531975 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-08-20 17:33+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-26 12:52+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -28,17 +28,16 @@ msgstr "[[!img install/inc/icons/clock.png link=\"no\" alt=\"\"]]"
#, fuzzy
#| msgid ""
#| "<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> "
-#| "<span class=\"expert\">1½ hour in total</span> <span class="
-#| "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
-#| "span>"
+#| "<span class=\"expert\">1½ hour in total</span> <span class=\"install-clone"
+#| "\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> <span "
-"class=\"expert upgrade-tails\">1½ hour in total</span> <span class="
-"\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\">1½ hours "
+"in total</span> <span class=\"install-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 heures au total</span> <span "
-"class=\"expert\">1 heure ½ au total</span> <span class=\"install-clone"
-"\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</span>"
+"class=\"expert\">1 heure ½ au total</span> <span class=\"install-clone\">½ "
+"heure</span> <span class=\"upgrade-clone\">¼ d'heure</span>"
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
@@ -51,16 +50,21 @@ msgstr ""
"\"]] à télécharger</small>"
#. type: Content of: <div><div><div><div><div><h4>
+#, fuzzy
+#| msgid ""
+#| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+#| "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+#| "small></span>"
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-"install</small></span> <span class=\"expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+"</span> <span class=\"windows linux mac-usb mac-dvd expert\"><small>½ hour "
+"to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 heure pour "
-"l'installation</small></span> <span class=\"expert\"><small>½ heure "
-"pour l'installation</small></span> <span class=\"upgrade-tails\"><small>½ "
-"heure pour la mise à jour</small></span>"
+"l'installation</small></span> <span class=\"expert\"><small>½ heure pour "
+"l'installation</small></span> <span class=\"upgrade-tails\"><small>½ heure "
+"pour la mise à jour</small></span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
@@ -82,44 +86,22 @@ msgstr "1 autre Tails"
msgid "<small>DVD or USB</small>"
msgstr "<small>sur un DVD ou une clé USB</small>"
-#. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "2 USB sticks"
-msgstr "2 clés USB"
+msgid "1 USB stick"
+msgstr "1 clé USB"
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>8 GB minimum</small>"
msgstr "<small>d'au moins 8 Go</small>"
-#. type: Content of: <div><div><div><div><div><h4><small>
-msgid "<small>All data will be lost!"
-msgstr "<small>Toutes les données seront perdues !"
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
-msgstr "[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]]</small>"
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-msgstr ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline.fr\" raw=\"yes\" "
-"sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "1 USB stick"
-msgstr "1 clé USB"
-
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>All data will be lost!</small>"
msgstr "<small>Toutes les données seront perdues !</small>"
+#. type: Content of: <div><div><div><div><div><h4><small>
+msgid "<small>All data will be lost!"
+msgstr "<small>Toutes les données seront perdues !"
+
#. type: Content of: <div><div><div><div><div><h4>
msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
msgstr "[[!toggle id=\"why_extra\" text=\"Pourquoi ?\"]]</small>"
@@ -166,31 +148,7 @@ msgstr "pour suivre les instructions </small>"
msgid "Your steps"
msgstr "Votre marche à suivre"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"First you will <span class=\"windows linux mac-usb\">install an intermediary "
-"Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn an "
-"intermediary Tails on a DVD.</span> <span class=\"expert\">install a "
-"Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd\">graver "
-"un Tails intermédiaire sur un DVD.</span> <span class=\"expert"
-"\">installer un Tails sur votre clé USB.</span> <span class=\"install-clone "
-"upgrade-clone\">redémarrer sur l'autre Tails.</span> <span class=\"upgrade-"
-"tails\">installer un Tails intermédiaire.</span>"
-
-#. type: Content of: <div><ol><li>
-msgid ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
-msgstr ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Pourquoi un Tails intermédiaire ?\"]]</small></span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
"image downloaded and verified\"]]"
@@ -198,11 +156,23 @@ 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><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Download"
msgstr "Téléchargement"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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-in-tails.png link=\"no\" "
+"alt=\"ISO image downloaded and verified\"]]"
+msgstr ""
+"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt="
+"\"Image ISO téléchargée et vérifiée\"]]"
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Computer restarted on USB stick on the left\"]]"
@@ -210,23 +180,27 @@ msgstr ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Ordinateur redémarré sur la clé USB de gauche\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Restart"
msgstr "Redémarrage"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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-intermediary-tails.png link=\"no\" alt="
-"\"ISO image installed on USB stick on the left\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
msgstr ""
-"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt="
+"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
"\"Image ISO installée sur la clé USB de gauche\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Install"
msgstr "Installation"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt=\"ISO "
"image installed on USB stick on the left\"]]"
@@ -234,33 +208,22 @@ msgstr ""
"[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
"\"Image ISO installée sur la clé USB de gauche\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div><p>
+msgid "Install intermediary"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inserted"
"\"]]"
msgstr ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inséré\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
-"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
-"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
-"on your USB stick.</span> <span class=\"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=\"mac-dvd\">installer le "
-"Tails final sur une clé USB.</span> <span class=\"install-clone\">installer "
-"Tails sur votre clé USB.</span> <span class=\"expert\">le configurer."
-"</span> <span class=\"upgrade-clone upgrade-tails\">mettre à jour votre "
-"Tails.</span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails installed on USB stick on the right\"]]"
@@ -268,15 +231,19 @@ msgstr ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails installé sur la clé USB de droite\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
+#| "class=\"upgrade\">Upgrade</span>"
msgid ""
-"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
-"class=\"upgrade\">Upgrade</span>"
+"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
+"\">Upgrade</span>"
msgstr ""
"<span class=\"install-clone windows linux mac-usb\">Installation</span> "
"<span class=\"upgrade\">Mise à jour</span>"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
"installed on USB stick on the right\"]]"
@@ -284,7 +251,7 @@ msgstr ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails installé "
"sur la clé USB de droite\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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\"]]"
@@ -292,31 +259,94 @@ msgstr ""
"[[!img install/inc/infography/create-persistence.png link=\"no\" alt="
"\"Chiffrement configuré sur la clé USB de droite\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Configure"
msgstr "Configuration"
+#~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+#~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+
+#~ msgid "2 USB sticks"
+#~ msgstr "2 clés USB"
+
+#~ msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
+#~ msgstr "[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]]</small>"
+
+#~ msgid ""
+#~ "[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
+#~ "\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" "
+#~ "sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
+#~ "\"]] [[!inline pages=\"install/inc/router/why_two.inline.fr\" raw=\"yes\" "
+#~ "sort=\"age\"]] \"\"\"]]"
+
+#~ msgid ""
+#~ "First you will <span class=\"windows linux mac-usb\">install an "
+#~ "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
+#~ "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~ "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
+#~ "\">graver un Tails intermédiaire sur un DVD.</span> <span class=\"expert"
+#~ "\">installer un Tails sur votre clé USB.</span> <span class=\"install-"
+#~ "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 mac-dvd upgrade-tails\"><small>[[!"
+#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
+#~ msgstr ""
+#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!"
+#~ "toggle id=\"why_two\" text=\"Pourquoi un Tails intermédiaire ?\"]]</"
+#~ "small></span>"
+
+#~ msgid ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#~ "alt=\"ISO image installed on USB stick on the left\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#~ "alt=\"Image ISO installée sur la clé USB de gauche\"]]"
+
+#~ msgid ""
+#~ "Then you will <span class=\"windows linux mac-usb\">install the final "
+#~ "Tails on the second USB stick.</span> <span class=\"mac-dvd\">install the "
+#~ "final Tails on your USB stick.</span> <span class=\"install-clone"
+#~ "\">install Tails on your USB stick.</span> <span class=\"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=\"mac-dvd\">installer le "
+#~ "Tails final sur une clé USB.</span> <span class=\"install-clone"
+#~ "\">installer Tails sur votre clé USB.</span> <span class=\"expert\">le "
+#~ "configurer.</span> <span class=\"upgrade-clone upgrade-tails\">mettre à "
+#~ "jour votre Tails.</span>"
+
#~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in "
-#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span "
-#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
-#~ "hour</span>"
+#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
+#~ "span>"
#~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 heures au "
-#~ "total</span> <span class=\"expert\">1 heure ½ au total</span> "
-#~ "<span class=\"install-clone\">½ heure</span> <span class=\"upgrade-clone"
-#~ "\">¼ d'heure</span>"
+#~ "total</span> <span class=\"expert\">1 heure ½ au total</span> <span class="
+#~ "\"install-clone\">½ heure</span> <span class=\"upgrade-clone\">¼ d'heure</"
+#~ "span>"
#~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-#~ "install</small></span> <span class=\"expert\"><small>½ hour to "
-#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
-#~ "upgrade</small></span>"
+#~ "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#~ "small></span> <span class=\"upgrade-tails\"><small>¼ hour to upgrade</"
+#~ "small></span>"
#~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 heure pour "
-#~ "l'installation</small></span> <span class=\"expert\"><small>½ "
-#~ "heure pour l'installation</small></span> <span class=\"upgrade-tails"
-#~ "\"><small>¼ heure pour la mise à jour</small></span>"
+#~ "l'installation</small></span> <span class=\"expert\"><small>½ heure pour "
+#~ "l'installation</small></span> <span class=\"upgrade-tails\"><small>¼ "
+#~ "heure pour la mise à jour</small></span>"
#~ msgid ""
#~ "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index b85db01..28a4645 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-08-20 17:33+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-09-02 14:00+0200\n"
"Last-Translator: ita team\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -28,9 +28,9 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> <span "
-"class=\"expert upgrade-tails\">1½ hour in total</span> <span class="
-"\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\">1½ hours "
+"in total</span> <span class=\"install-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
@@ -41,12 +41,17 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
+#| "class=\"upgrade\">Upgrade</span>"
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-"install</small></span> <span class=\"expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+"</span> <span class=\"windows linux mac-usb mac-dvd expert\"><small>½ hour "
+"to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
+"<span class=\"install-clone windows linux mac-usb\">Installa</span> <span "
+"class=\"upgrade\">Aggiorna</span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
@@ -56,8 +61,8 @@ msgstr "[[!img install/inc/icons/1-usb.png link=\"no\" alt=\"\"]]"
msgid "Your Tails"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 ore</span> <span class="
-"\"expert\">1½ ora</span> <span class=\"install-clone\">½ ora</span> "
-"<span class=\"upgrade-clone\">¼ ora</span>"
+"\"expert\">1½ ora</span> <span class=\"install-clone\">½ ora</span> <span "
+"class=\"upgrade-clone\">¼ ora</span>"
#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
@@ -71,18 +76,18 @@ msgstr "1 altra Tails"
msgid "<small>DVD or USB</small>"
msgstr "<small>DVD o USB</small>"
-#. type: Content of: <div><div><div><div>
-msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "2 USB sticks"
-msgstr "2 chiavette USB"
+msgid "1 USB stick"
+msgstr "1 chiavetta USB "
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>8 GB minimum</small>"
msgstr "<small>8 GB almeno di spazio di archiviazione</small>"
+#. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Tutti i dati andranno persi!</small>"
+
#. type: Content of: <div><div><div><div><div><h4><small>
#, fuzzy
#| msgid "<small>All data will be lost!</small>"
@@ -90,25 +95,6 @@ msgid "<small>All data will be lost!"
msgstr "<small>Tutti i dati andranno persi!</small>"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "1 USB stick"
-msgstr "1 chiavetta USB "
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>All data will be lost!</small>"
-msgstr "<small>Tutti i dati andranno persi!</small>"
-
-#. type: Content of: <div><div><div><div><div><h4>
msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
msgstr ""
@@ -151,70 +137,54 @@ msgstr "per seguire le istruzioni </small>"
msgid "Your steps"
msgstr "La procedura"
-#. type: Content of: <div><ol><li><h4>
-#, fuzzy
-#| msgid ""
-#| "First you will <span class=\"windows linux mac-usb\">install an "
-#| "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
-#| "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
-#| "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd\">burn an "
-"intermediary Tails on a DVD.</span> <span class=\"expert\">install a "
-"Tails on your USB stick.</span> <span class=\"install-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> <span "
-"class=\"mac-dvd\">masterizzare una Tails, che farà da intermediazione, su un "
-"DVD.</span> <span class=\"expert\">installare una Tails sulla "
-"chiavetta USB.</span> <span class=\"install-clone upgrade-clone\">riavviare "
-"partendo dall'altra Tails.</span> <span class=\"upgrade-tails\">installare e "
-"fare l'avanzamento di versione dalla Tails che fa l'intermediazione.</span>"
-
-#. type: Content of: <div><ol><li>
-msgid ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
-msgstr ""
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/download-and-verify.png link=\"no\" alt=\"ISO "
"image downloaded and verified\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Download"
msgstr "Scarica"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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-in-tails.png link=\"no\" "
+"alt=\"ISO image downloaded and verified\"]]"
+msgstr ""
+"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" "
"alt=\"Computer restarted on USB stick on the left\"]]"
msgstr ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Restart"
msgstr "Riavvia"
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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/install-intermediary-tails.png link=\"no\" alt="
-"\"ISO image installed on USB stick on the left\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
msgstr ""
"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Install"
msgstr "Installa"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
@@ -225,62 +195,101 @@ msgid ""
msgstr ""
"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div><p>
+msgid "Install intermediary"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/insert-dvd.png link=\"no\" alt=\"DVD inserted"
"\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
-"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
-"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
-"on your USB stick.</span> <span class=\"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=\"mac-dvd\">installa Tails finalmente "
-"sulla tua chiavetta USB.</span> <span class=\"install-clone\">installa Tails "
-"sulla chiavetta USB.</span> <span class=\"expert\">configurala.</"
-"span> <span class=\"upgrade-clone upgrade-tails\">aggiorna la tua Tails.</"
-"span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" alt="
"\"Tails installed on USB stick on the right\"]]"
msgstr ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
+#| "class=\"upgrade\">Upgrade</span>"
msgid ""
-"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
-"class=\"upgrade\">Upgrade</span>"
+"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
+"\">Upgrade</span>"
msgstr ""
"<span class=\"install-clone windows linux mac-usb\">Installa</span> <span "
"class=\"upgrade\">Aggiorna</span>"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
"[[!img install/inc/infography/clone-dvd.png link=\"no\" alt=\"Tails "
"installed on USB stick on the right\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. 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\"]]"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Configure"
msgstr "Configura"
+#~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+#~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+
+#~ msgid "2 USB sticks"
+#~ msgstr "2 chiavette USB"
+
+#, fuzzy
+#~| msgid ""
+#~| "First you will <span class=\"windows linux mac-usb\">install an "
+#~| "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
+#~| "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~| "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
+#~ "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~ "\">install a Tails on your USB stick.</span> <span class=\"install-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> "
+#~ "<span class=\"mac-dvd\">masterizzare una Tails, che farà da "
+#~ "intermediazione, su un DVD.</span> <span class=\"expert\">installare una "
+#~ "Tails sulla chiavetta USB.</span> <span class=\"install-clone upgrade-"
+#~ "clone\">riavviare partendo dall'altra Tails.</span> <span class=\"upgrade-"
+#~ "tails\">installare e fare l'avanzamento di versione dalla Tails che fa "
+#~ "l'intermediazione.</span>"
+
+#~ msgid ""
+#~ "Then you will <span class=\"windows linux mac-usb\">install the final "
+#~ "Tails on the second USB stick.</span> <span class=\"mac-dvd\">install the "
+#~ "final Tails on your USB stick.</span> <span class=\"install-clone"
+#~ "\">install Tails on your USB stick.</span> <span class=\"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=\"mac-dvd\">installa Tails "
+#~ "finalmente sulla tua chiavetta USB.</span> <span class=\"install-clone"
+#~ "\">installa Tails sulla chiavetta USB.</span> <span class=\"expert"
+#~ "\">configurala.</span> <span class=\"upgrade-clone upgrade-tails"
+#~ "\">aggiorna la tua Tails.</span>"
+
#~ msgid "Upgrade"
#~ msgstr "Aggiorna"
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index 70111bf..6f30b3b 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-08-20 17:33+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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 mac-dvd\">2 hours</span> <span class="
-#| "\"expert\">1½ hour</span> <span class=\"install-clone\">½ hour</"
-#| "span> <span class=\"upgrade-clone\">¼ hour</span>"
+#| "\"expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+#| "<span class=\"upgrade-clone\">¼ hour</span>"
msgid ""
-"<span class=\"windows linux mac-usb mac-dvd\">2 hours in total</span> <span "
-"class=\"expert upgrade-tails\">1½ hour in total</span> <span class="
-"\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</span>"
+"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\">1½ hours "
+"in total</span> <span class=\"install-clone\">½ hour</span> <span class="
+"\"upgrade-clone\">¼ hour</span>"
msgstr ""
"<span class=\"windows linux mac-usb mac-dvd\">2 horas</span> <span class="
-"\"expert\">1½ hora</span> <span class=\"install-clone\">½ hora</span> "
-"<span class=\"upgrade-clone\">¼ de hora</span>"
+"\"expert\">1½ hora</span> <span class=\"install-clone\">½ hora</span> <span "
+"class=\"upgrade-clone\">¼ de hora</span>"
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
@@ -58,19 +58,18 @@ msgstr ""
#, fuzzy
#| msgid ""
#| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-#| "install</small></span> <span class=\"expert\"><small>½ hour to "
-#| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-#| "upgrade</small></span>"
+#| "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+#| "small></span>"
msgid ""
-"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-"install</small></span> <span class=\"expert\"><small>½ hour to "
-"install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+"</span> <span class=\"windows linux mac-usb mac-dvd expert\"><small>½ hour "
+"to install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
"upgrade</small></span>"
msgstr ""
"</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para "
-"instalar</small></span> <span class=\"expert\"><small>½ hora para "
-"instalar</small></span> <span class=\"upgrade-tails\"><small>½ hora para "
-"atualizar</small></span>"
+"instalar</small></span> <span class=\"expert\"><small>½ hora para instalar</"
+"small></span> <span class=\"upgrade-tails\"><small>½ hora para atualizar</"
+"small></span>"
#. type: Content of: <div><div><div><div>
#, fuzzy
@@ -94,20 +93,18 @@ msgstr "1 outro Tails"
msgid "<small>DVD or USB</small>"
msgstr "<small>DVD ou USB</small>"
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
-msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
-msgstr "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
-
#. type: Content of: <div><div><div><div><div><h4>
-msgid "2 USB sticks"
-msgstr "2 memórias USB"
+msgid "1 USB stick"
+msgstr "1 memória USB"
#. type: Content of: <div><div><div><div><div><h4>
msgid "<small>8 GB minimum</small>"
msgstr "<small>mínimo de 8 GB</small>"
+#. type: Content of: <div><div><div><div><div><h4>
+msgid "<small>All data will be lost!</small>"
+msgstr "<small>Todos os dados serão apagados!</small>"
+
#. type: Content of: <div><div><div><div><div><h4><small>
#, fuzzy
#| msgid "<small>All data will be lost!</small>"
@@ -115,25 +112,6 @@ msgid "<small>All data will be lost!"
msgstr "<small>Todos os dados serão apagados!</small>"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "[[!toggle id=\"why_two\" text=\"Why 2?\"]]</small>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid ""
-"[[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X"
-"\"]] [[!inline pages=\"install/inc/router/why_two.inline\" raw=\"yes\" sort="
-"\"age\"]] \"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "1 USB stick"
-msgstr "1 memória USB"
-
-#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>All data will be lost!</small>"
-msgstr "<small>Todos os dados serão apagados!</small>"
-
-#. type: Content of: <div><div><div><div><div><h4>
msgid "[[!toggle id=\"why_extra\" text=\"Why?\"]]</small>"
msgstr ""
@@ -181,45 +159,7 @@ msgstr "para acompanhar as instruções </small>"
msgid "Your steps"
msgstr "Seus passos"
-#. type: Content of: <div><ol><li><h4>
-#, fuzzy
-#| msgid ""
-#| "First you will <span class=\"windows linux mac-usb\">install an "
-#| "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
-#| "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
-#| "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd\">burn an "
-"intermediary Tails on a DVD.</span> <span class=\"expert\">install a "
-"Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd\">gravar "
-"um Tails intermediário em um DVD.</span> <span class=\"expert"
-"\">instalar um Tails na sua memória USB.</span> <span class=\"install-clone "
-"upgrade-clone\">reiniciar o outro Tails.</span> <span class=\"upgrade-tails"
-"\">instalar e atualizar um Tails intermediário.</span>"
-
-#. type: Content of: <div><ol><li>
-#, fuzzy
-#| msgid ""
-#| "<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails"
-#| "\"> <small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
-#| "\"age\"]] to download</small>"
-msgid ""
-"<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!toggle "
-"id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
-msgstr ""
-"<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\"> "
-"<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age"
-"\"]] para baixar</small>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
msgid ""
@@ -227,11 +167,19 @@ msgid ""
"image downloaded and verified\"]]"
msgstr "[[!img install/inc/infography/download-and-verify.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Download"
msgstr ""
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| 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\"]]"
+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-intermediary-tails.png link=\"no"
@@ -242,25 +190,23 @@ msgid ""
msgstr ""
"[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Restart"
msgstr "Reinicie"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
-#| msgid ""
-#| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
+#| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
msgid ""
-"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt="
-"\"ISO image installed on USB stick on the left\"]]"
-msgstr ""
-"[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
+"[[!img install/inc/infography/install-tails.png link=\"no\" alt=\"ISO image "
+"installed on USB stick on the right\"]]"
+msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Install"
msgstr "Instale"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
msgid ""
@@ -268,7 +214,11 @@ msgid ""
"image installed on USB stick on the left\"]]"
msgstr "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div><p>
+msgid "Install intermediary"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
msgid ""
@@ -276,27 +226,13 @@ msgid ""
"\"]]"
msgstr "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/icons/restart.png link=\"no\"]]"
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr "[[!img install/inc/icons/restart.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><h4>
-msgid ""
-"Then you will <span class=\"windows linux mac-usb\">install the final Tails "
-"on the second USB stick.</span> <span class=\"mac-dvd\">install the final "
-"Tails on your USB stick.</span> <span class=\"install-clone\">install Tails "
-"on your USB stick.</span> <span class=\"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=\"mac-dvd\">instalar o Tails "
-"final na sua unidade USB.</span> <span class=\"install-clone\">instalar o "
-"Tails na unidade USB.</span> <span class=\"expert\">configurá-lo.</"
-"span> <span class=\"upgrade-clone upgrade-tails\">atualizar seu Tails.</span>"
-
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
@@ -306,15 +242,19 @@ msgid ""
msgstr ""
"[[!img install/inc/infography/clone-intermediary-tails.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
+#| "class=\"upgrade\">Upgrade</span>"
msgid ""
-"<span class=\"install-clone windows linux mac-usb\">Install</span> <span "
-"class=\"upgrade\">Upgrade</span>"
+"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
+"\">Upgrade</span>"
msgstr ""
"<span class=\"install-clone windows linux mac-usb\">Instale</span> <span "
"class=\"upgrade\">Atualize</span>"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
msgid ""
@@ -322,7 +262,7 @@ msgid ""
"installed on USB stick on the right\"]]"
msgstr "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
msgid ""
@@ -330,36 +270,105 @@ msgid ""
"\"Encryption configured on USB stick on the right\"]]"
msgstr "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
-#. type: Content of: <div><ol><li><div><div><div><div><h5>
+#. type: Content of: <div><div><div><div><p>
msgid "Configure"
msgstr ""
#, fuzzy
+#~| msgid "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
+#~ msgid "[[!img install/inc/icons/2-usb.png link=\"no\" alt=\"\"]]"
+#~ msgstr "[[!img install/inc/icons/2-usb.png link=\"no\"]]"
+
+#~ msgid "2 USB sticks"
+#~ msgstr "2 memórias USB"
+
+#, fuzzy
+#~| msgid ""
+#~| "First you will <span class=\"windows linux mac-usb\">install an "
+#~| "intermediary Tails on the first USB stick.</span> <span class=\"mac-dvd"
+#~| "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~| "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
+#~ "\">burn an intermediary Tails on a DVD.</span> <span class=\"expert"
+#~ "\">install a Tails on your USB stick.</span> <span class=\"install-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=\"mac-dvd"
+#~ "\">gravar um Tails intermediário em um DVD.</span> <span class=\"expert"
+#~ "\">instalar um Tails na sua memória USB.</span> <span class=\"install-"
+#~ "clone upgrade-clone\">reiniciar o outro Tails.</span> <span class="
+#~ "\"upgrade-tails\">instalar e atualizar um Tails intermediário.</span>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\"> "
+#~| "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+#~| "\"age\"]] to download</small>"
+#~ msgid ""
+#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\"><small>[[!"
+#~ "toggle id=\"why_two\" text=\"Why an intermediary Tails?\"]]</small></span>"
+#~ msgstr ""
+#~ "<span class=\"windows linux mac-usb mac-dvd expert upgrade-tails\"> "
+#~ "<small>[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+#~ "\"age\"]] para baixar</small>"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!img install/inc/infography/install-intermediary-tails.png link=\"no"
+#~| "\"]]"
+#~ msgid ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" "
+#~ "alt=\"ISO image installed on USB stick on the left\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/infography/install-intermediary-tails.png link=\"no\"]]"
+
+#~ msgid ""
+#~ "Then you will <span class=\"windows linux mac-usb\">install the final "
+#~ "Tails on the second USB stick.</span> <span class=\"mac-dvd\">install the "
+#~ "final Tails on your USB stick.</span> <span class=\"install-clone"
+#~ "\">install Tails on your USB stick.</span> <span class=\"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=\"mac-dvd\">instalar o "
+#~ "Tails final na sua unidade USB.</span> <span class=\"install-clone"
+#~ "\">instalar o Tails na unidade USB.</span> <span class=\"expert"
+#~ "\">configurá-lo.</span> <span class=\"upgrade-clone upgrade-tails"
+#~ "\">atualizar seu Tails.</span>"
+
+#, fuzzy
#~| msgid ""
#~| "<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
-#~| "\"expert\">1½ hour</span> <span class=\"install-clone\">½ hour</"
-#~| "span> <span class=\"upgrade-clone\">¼ hour</span>"
+#~| "\"expert\">1½ hour</span> <span class=\"install-clone\">½ hour</span> "
+#~| "<span class=\"upgrade-clone\">¼ hour</span>"
#~ msgid ""
#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in "
-#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span "
-#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
-#~ "hour</span>"
+#~ "total</span> <span class=\"expert\">1½ hour in total</span> <span class="
+#~ "\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ hour</"
+#~ "span>"
#~ msgstr ""
#~ "<span class=\"windows linux mac-usb mac-dvd\">2 horas</span> <span class="
-#~ "\"expert\">1½ hora</span> <span class=\"install-clone\">½ hora</"
-#~ "span> <span class=\"upgrade-clone\">¼ de hora</span>"
+#~ "\"expert\">1½ hora</span> <span class=\"install-clone\">½ hora</span> "
+#~ "<span class=\"upgrade-clone\">¼ de hora</span>"
#, fuzzy
#~| msgid ""
#~| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-#~| "install</small></span> <span class=\"expert\"><small>½ hour to "
-#~| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
-#~| "upgrade</small></span>"
+#~| "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#~| "small></span> <span class=\"upgrade-tails\"><small>½ hour to upgrade</"
+#~| "small></span>"
#~ msgid ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
-#~ "install</small></span> <span class=\"expert\"><small>½ hour to "
-#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
-#~ "upgrade</small></span>"
+#~ "install</small></span> <span class=\"expert\"><small>½ hour to install</"
+#~ "small></span> <span class=\"upgrade-tails\"><small>¼ hour to upgrade</"
+#~ "small></span>"
#~ msgstr ""
#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hora para "
#~ "instalar</small></span> <span class=\"expert\"><small>½ hora para "
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.de.po b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
index 9e3dc23..259292c 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.de.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,46 +44,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
-msgstr "<div class=\"tip debian\">\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>To know your version of Debian or Ubuntu, open\n"
-#| "<span class=\"application\">Settings</span> and click on\n"
-#| "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-#| "<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgstr ""
-"<p>Um Ihre Version von Debian oder Ubuntu herauszufinden, öffnen Sie\n"
-"<span class=\"application\">Systemeinstellungen</span> und klicken Sie auf\n"
-"<span class=\"guilabel\">Details</span>. Beziehen Sie sich bei Debian auf die\n"
-"Informationen zum <span class=\"guilabel\">Basissystem</span>.</p>\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>To know your version of Ubuntu, execute\n"
-#| "<span class=\"command\">lsb_release -a</span>.</p>\n"
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
-msgstr ""
-"<p>Um Ihre Version von Ubuntu herauszufinden, führen Sie\n"
-"<span class=\"command\">lsb_release -a</span> aus.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"tip expert\">\n"
msgstr "<div class=\"tip expert\">\n"
@@ -102,6 +62,42 @@ msgstr ""
msgid "<pre><code>lsb_release -a</code></pre>\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#~ msgid "<div class=\"tip debian\">\n"
+#~ msgstr "<div class=\"tip debian\">\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>To know your version of Debian or Ubuntu, open\n"
+#~| "<span class=\"application\">Settings</span> and click on\n"
+#~| "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~| "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Debian or Ubuntu, open\n"
+#~ "<span class=\"application\">System Settings</span> and click on\n"
+#~ "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~ "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgstr ""
+#~ "<p>Um Ihre Version von Debian oder Ubuntu herauszufinden, öffnen Sie\n"
+#~ "<span class=\"application\">Systemeinstellungen</span> und klicken Sie auf\n"
+#~ "<span class=\"guilabel\">Details</span>. Beziehen Sie sich bei Debian auf die\n"
+#~ "Informationen zum <span class=\"guilabel\">Basissystem</span>.</p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>To know your version of Ubuntu, execute\n"
+#~| "<span class=\"command\">lsb_release -a</span>.</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Linux Mint, open the application\n"
+#~ "<span class=\"application\">Welcome Screen</span>.\n"
+#~ msgstr ""
+#~ "<p>Um Ihre Version von Ubuntu herauszufinden, führen Sie\n"
+#~ "<span class=\"command\">lsb_release -a</span> aus.</p>\n"
+
#~ msgid ""
#~ "<h1 id=\"install-installer\">Install <span class=\"application\">Tails "
#~ "Installer</span></h1>\n"
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.es.po b/wiki/src/install/inc/steps/debian_requirements.inline.es.po
index 8653077..c4c18ef 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.es.po
+++ b/wiki/src/install/inc/steps/debian_requirements.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-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-05-21 08:29+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -48,47 +48,41 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
-msgstr "<div class=\"tip debian\">\n"
+msgid "<div class=\"tip expert\">\n"
+msgstr "<div class=\"tip expert\">\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgstr ""
-"<p>Para saber tu versión de Debian o Ubuntu, abre\n"
-"<span class=\"application\">Configuración del Sistema</span> y haz click en\n"
-"<span class=\"guilabel\">Detalles</span>. Para Debian, ve a la\n"
-"información de <span class=\"guilabel\">Sistema base</span>.</p>\n"
+msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
+msgstr "<p>Para conocer tu versión de Debian, Ubuntu, o Linux Mint, ejecuta:</p>\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
-msgstr ""
-"<p>Para saber tu versión de Linux Mint, abre la aplicación\n"
-"<span class=\"application\">Pantalla de Bienvenida</span>.\n"
+msgid "<pre><code>lsb_release -a</code></pre>\n"
+msgstr "<pre><code>lsb_release -a</code></pre>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip expert\">\n"
-msgstr "<div class=\"tip expert\">\n"
+#~ msgid "<div class=\"tip debian\">\n"
+#~ msgstr "<div class=\"tip debian\">\n"
-#. type: Plain text
-#, no-wrap
-msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
-msgstr "<p>Para conocer tu versión de Debian, Ubuntu, o Linux Mint, ejecuta:</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Debian or Ubuntu, open\n"
+#~ "<span class=\"application\">System Settings</span> and click on\n"
+#~ "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~ "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgstr ""
+#~ "<p>Para saber tu versión de Debian o Ubuntu, abre\n"
+#~ "<span class=\"application\">Configuración del Sistema</span> y haz click en\n"
+#~ "<span class=\"guilabel\">Detalles</span>. Para Debian, ve a la\n"
+#~ "información de <span class=\"guilabel\">Sistema base</span>.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<pre><code>lsb_release -a</code></pre>\n"
-msgstr "<pre><code>lsb_release -a</code></pre>\n"
+#~ msgid ""
+#~ "<p>To know your version of Linux Mint, open the application\n"
+#~ "<span class=\"application\">Welcome Screen</span>.\n"
+#~ msgstr ""
+#~ "<p>Para saber tu versión de Linux Mint, abre la aplicación\n"
+#~ "<span class=\"application\">Pantalla de Bienvenida</span>.\n"
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
index 552ed29..e7a325d 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -42,41 +42,20 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
+msgid "<div class=\"tip expert\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
+msgid "<pre><code>lsb_release -a</code></pre>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip expert\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<pre><code>lsb_release -a</code></pre>\n"
-msgstr ""
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
index 285f820..bb3f4fb 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-05-16 09:42+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -46,50 +46,44 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
-msgstr "<div class=\"tip debian\">\n"
+msgid "<div class=\"tip expert\">\n"
+msgstr "<div class=\"tip expert\">\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgstr ""
-"<p>Pour connaître votre version de Debian ou Ubuntu, ouvrez\n"
-"<span class=\"application\">Paramètres</span> et cliquez sur\n"
-"<span class=\"guilabel\">Détails</span>. Pour Debian, se reporter à\n"
-"l'information <span class=\"guilabel\">Distribution</span>.</p>\n"
+msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
+msgstr "<p>Pour connaître votre version de Debian, Ubuntu ou Linux Mint, exécutez :</p>\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
-msgstr ""
-"<p>Pour connaître votre version de Linux Mint, ouvrez l'application\n"
-"<span class=\"application\">Écran d'accueil</span>.\n"
+msgid "<pre><code>lsb_release -a</code></pre>\n"
+msgstr "<pre><code>lsb_release -a</code></pre>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip expert\">\n"
-msgstr "<div class=\"tip expert\">\n"
+#~ msgid "<div class=\"tip debian\">\n"
+#~ msgstr "<div class=\"tip debian\">\n"
-#. type: Plain text
-#, no-wrap
-msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
-msgstr "<p>Pour connaître votre version de Debian, Ubuntu ou Linux Mint, exécutez :</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Debian or Ubuntu, open\n"
+#~ "<span class=\"application\">System Settings</span> and click on\n"
+#~ "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~ "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgstr ""
+#~ "<p>Pour connaître votre version de Debian ou Ubuntu, ouvrez\n"
+#~ "<span class=\"application\">Paramètres</span> et cliquez sur\n"
+#~ "<span class=\"guilabel\">Détails</span>. Pour Debian, se reporter à\n"
+#~ "l'information <span class=\"guilabel\">Distribution</span>.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<pre><code>lsb_release -a</code></pre>\n"
-msgstr "<pre><code>lsb_release -a</code></pre>\n"
+#~ msgid ""
+#~ "<p>To know your version of Linux Mint, open the application\n"
+#~ "<span class=\"application\">Welcome Screen</span>.\n"
+#~ msgstr ""
+#~ "<p>Pour connaître votre version de Linux Mint, ouvrez l'application\n"
+#~ "<span class=\"application\">Écran d'accueil</span>.\n"
#~ msgid ""
#~ "<h1 id=\"install-installer\">Install <span class=\"application\">Tails "
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.it.po b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
index 5443f87..81b79e2 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.it.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -42,23 +42,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
-msgstr "<div class=\"tip debian\">\n"
+msgid "<div class=\"tip expert\">\n"
+msgstr "<div class=\"tip expert\">\n"
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
+msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
+msgid "<pre><code>lsb_release -a</code></pre>\n"
msgstr ""
#. type: Plain text
@@ -66,20 +60,8 @@ msgstr ""
msgid "</div>\n"
msgstr "</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip expert\">\n"
-msgstr "<div class=\"tip expert\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>To know your version of Debian, Ubuntu, or Linux Mint, execute:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<pre><code>lsb_release -a</code></pre>\n"
-msgstr ""
+#~ msgid "<div class=\"tip debian\">\n"
+#~ msgstr "<div class=\"tip debian\">\n"
#~ msgid ""
#~ "<h1 id=\"install-installer\">Install <span class=\"application\">Tails "
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
index 63b61de..653d47d 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-05-08 15:49+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-07-12 18:42+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -54,46 +54,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"tip debian\">\n"
-msgstr "<div class=\"tip debian\">\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>To know your version of Debian or Ubuntu, open\n"
-#| "<span class=\"application\">System Settings</span> and click on\n"
-#| "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-#| "<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgid ""
-"<p>To know your version of Debian or Ubuntu, open\n"
-"<span class=\"application\">System Settings</span> and click on\n"
-"<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
-"<span class=\"guilabel\">Base system</span> information.</p>\n"
-msgstr ""
-"<p>Para saber a versão do Debian ou Ubuntu, abra\n"
-"<span class=\"application\">Configurações do Sistema</span> e clique em\n"
-"<span class=\"guilabel\">Detalhes</span>. No Debian, olhe a\n"
-"informação em <span class=\"guilabel\">Sistema base</span>.</p>\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>To know your version of Ubuntu, execute\n"
-#| "<span class=\"command\">lsb_release -a</span>.</p>\n"
-msgid ""
-"<p>To know your version of Linux Mint, open the application\n"
-"<span class=\"application\">Welcome Screen</span>.\n"
-msgstr ""
-"<p>Para saber a versão do Ubuntu, execute\n"
-"<span class=\"command\">lsb_release -a</span>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid "<div class=\"tip expert\">\n"
msgstr "<div class=\"tip expert\">\n"
@@ -112,6 +72,42 @@ msgstr ""
msgid "<pre><code>lsb_release -a</code></pre>\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#~ msgid "<div class=\"tip debian\">\n"
+#~ msgstr "<div class=\"tip debian\">\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>To know your version of Debian or Ubuntu, open\n"
+#~| "<span class=\"application\">System Settings</span> and click on\n"
+#~| "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~| "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Debian or Ubuntu, open\n"
+#~ "<span class=\"application\">System Settings</span> and click on\n"
+#~ "<span class=\"guilabel\">Details</span>. For Debian, refer to the\n"
+#~ "<span class=\"guilabel\">Base system</span> information.</p>\n"
+#~ msgstr ""
+#~ "<p>Para saber a versão do Debian ou Ubuntu, abra\n"
+#~ "<span class=\"application\">Configurações do Sistema</span> e clique em\n"
+#~ "<span class=\"guilabel\">Detalhes</span>. No Debian, olhe a\n"
+#~ "informação em <span class=\"guilabel\">Sistema base</span>.</p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>To know your version of Ubuntu, execute\n"
+#~| "<span class=\"command\">lsb_release -a</span>.</p>\n"
+#~ msgid ""
+#~ "<p>To know your version of Linux Mint, open the application\n"
+#~ "<span class=\"application\">Welcome Screen</span>.\n"
+#~ msgstr ""
+#~ "<p>Para saber a versão do Ubuntu, execute\n"
+#~ "<span class=\"command\">lsb_release -a</span>.</p>\n"
+
#~ msgid ""
#~ "<h1 id=\"install-installer\">Install <span class=\"application\">Tails "
#~ "Installer</span></h1>\n"
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index 415ccb5..ed5bd12 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -33,8 +33,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -104,8 +104,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
#. type: Content of: <div><div><div><div><p><b>
@@ -352,26 +352,21 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
@@ -408,15 +403,6 @@ msgstr "[["
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
@@ -465,11 +451,7 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
@@ -546,10 +528,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
@@ -618,8 +596,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -662,8 +640,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -674,20 +652,19 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -712,8 +689,8 @@ msgstr ""
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
diff --git a/wiki/src/install/inc/steps/download.inline.es.po b/wiki/src/install/inc/steps/download.inline.es.po
index 996cd6c..d9a442f 100644
--- a/wiki/src/install/inc/steps/download.inline.es.po
+++ b/wiki/src/install/inc/steps/download.inline.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-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-05-09 18:54+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -36,11 +36,11 @@ msgstr "Descarga directa"
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Descarga Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Descarga Tails"
#. type: Content of: <div><div><div><div><div>
#, fuzzy
@@ -120,11 +120,11 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verifca tu descarga usando tu navegador"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verifca tu descarga usando tu navegador"
#. type: Content of: <div><div><div><div><p><b>
msgid "<b>For your security,"
@@ -399,33 +399,39 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
#, fuzzy
#| msgid ""
-#| "<span class=\"step-number\"><span class=\"windows linux mac-usb "
-#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\""
-#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
-#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
-#| "upgrading</span>"
-msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
-msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"windows "
-"linux mac-usb mac-dvd\">instalando</span> <span class=\"upgrade-tails"
-"\">actualizando</span> <span class=\"download-only\">instalando o "
-"actualizando</span>"
+#| "<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+#| "upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+#| "usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+#| "span> <span class=\"download-only\">installing or upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continúa <span class=\"windows linux mac-"
+"usb mac-dvd\">instalando</span> <span class=\"upgrade-tails\">actualizando</"
+"span> <span class=\"download-only\">instalando o actualizando</span>"
#. type: Content of: <div><div><div><div>
-msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
+#, fuzzy
+#| msgid ""
+#| "<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+#| "\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+#| "download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
+#| "usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> "
+#| "<span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+#| "\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span "
+#| "class=\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
+msgid ""
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
"<span class=\"debian\">[[Saltear la descarga|debian/usb]]</span> <span class="
"\"windows\">[[Saltear la descarga|win/usb]]</span> <span class=\"linux"
@@ -437,10 +443,6 @@ msgstr ""
"upgrade/tails]]</span>"
#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
-msgstr "[[Omitir verificación!|debian/usb]]"
-
-#. type: Content of: <div><div><div><div><div><div>
msgid "[[Skip verification!|win/usb]]"
msgstr "[[Omitir verificación!|win/usb]]"
@@ -474,17 +476,6 @@ msgstr "[["
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-"Ahora, instala <em>Tails Installer</em> (<span class=\"next-counter\"></"
-"span>)"
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr "|debian/usb]]"
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
"Ahora, instala un Tails intermedio (<span class=\"next-counter\"></span>)"
@@ -534,12 +525,10 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr "[[Instalar desde Windows|install/win/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr "[[Instalar desde Debian, Ubuntu, o Mint|install/debian/usb]]"
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
-msgstr "[[Instalar desde otra distribución de Linux|install/linux/usb]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
+msgstr "[[Instalar desde Windows|install/win/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
@@ -628,10 +617,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr "Copia y pega este enlace en Firefox, Chrome, o Tor Browser:"
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr "<code>https://tails.boum.org/install/win/usb-download/</code>"
@@ -709,11 +694,11 @@ msgstr "BitTorrent no funciona a través de Tor, ni en Tails."
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Descarga Tails (archivo Torrent)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Descarga Tails (archivo Torrent)"
#. type: Content of: <div><div><div><div>
#, fuzzy
@@ -753,11 +738,11 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verifcar tu descarga con BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verifcar tu descarga con BitTorrent"
#. type: Content of: <div><div><div><p>
msgid ""
@@ -770,23 +755,21 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
#, fuzzy
#| msgid ""
-#| "<span class=\"step-number\"><span class=\"windows linux mac-usb "
-#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\""
-#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
-#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
-#| "upgrading</span>"
-msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
-msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"windows "
-"linux mac-usb mac-dvd\">instalando</span> <span class=\"upgrade-tails"
-"\">actualizando</span> <span class=\"download-only\">instalando o "
-"actualizando</span>"
+#| "<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+#| "upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+#| "usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+#| "span> <span class=\"download-only\">installing or upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continúa <span class=\"windows linux mac-"
+"usb mac-dvd\">instalando</span> <span class=\"upgrade-tails\">actualizando</"
+"span> <span class=\"download-only\">instalando o actualizando</span>"
#. type: Content of: <div><div><div><p>
#, fuzzy
@@ -797,9 +780,8 @@ msgstr ""
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
"Abre y descarga el archivo torrent con tu cliente de torrents favorito (ej. "
"BitTorrent). Contiene la imagen ISO de Tails [[!inline pages=\"inc/"
@@ -831,8 +813,8 @@ msgstr "Descarga la [[llave de firma de Tails|tails-signing.key]]."
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -1317,6 +1299,28 @@ msgid ""
"verification process."
msgstr ""
+#~ msgid "[[Skip verification!|debian/usb]]"
+#~ msgstr "[[Omitir verificación!|debian/usb]]"
+
+#~ msgid ""
+#~ "Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></"
+#~ "span>)"
+#~ msgstr ""
+#~ "Ahora, instala <em>Tails Installer</em> (<span class=\"next-counter\"></"
+#~ "span>)"
+
+#~ msgid "|debian/usb]]"
+#~ msgstr "|debian/usb]]"
+
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+#~ msgstr "[[Instalar desde Debian, Ubuntu, o Mint|install/debian/usb]]"
+
+#~ msgid "[[Install from other Linux distributions|install/linux/usb]]"
+#~ msgstr "[[Instalar desde otra distribución de Linux|install/linux/usb]]"
+
+#~ msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+#~ msgstr "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+
#~ msgid ""
#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#~ msgstr ""
@@ -1355,18 +1359,18 @@ msgstr ""
#~ msgstr "Baja y verifica la imagen ISO de Tails"
#~ msgid ""
-#~ "<span class=\"windows mac-usb mac-dvd linux upgrade-tails dvd vm"
-#~ "\">In this step you</span> <span class=\"download-only\">You</span> will "
+#~ "<span class=\"windows mac-usb mac-dvd linux upgrade-tails dvd vm\">In "
+#~ "this step you</span> <span class=\"download-only\">You</span> will "
#~ "download Tails as an ISO image: a single file containing the whole "
#~ "operating system. For your security, it is very important to also verify "
#~ "your download. We propose you two techniques to do this verification "
#~ "automatically."
#~ msgstr ""
-#~ "<span class=\"windows mac-usb mac-dvd linux upgrade-tails dvd vm"
-#~ "\">En este paso</span> <span class=\"download-only\">Ahora</span> te "
-#~ "bajarás Tails como una sola imagen ISO: un solo archivo que contiene todo "
-#~ "el sistema operativo. Por tu seguridad, es importante también verificar "
-#~ "tu descarga. Te proponemos dos técnicas para realizar esta verificación "
+#~ "<span class=\"windows mac-usb mac-dvd linux upgrade-tails dvd vm\">En "
+#~ "este paso</span> <span class=\"download-only\">Ahora</span> te bajarás "
+#~ "Tails como una sola imagen ISO: un solo archivo que contiene todo el "
+#~ "sistema operativo. Por tu seguridad, es importante también verificar tu "
+#~ "descarga. Te proponemos dos técnicas para realizar esta verificación "
#~ "automáticamente."
#~ msgid "[[!img lib/spinner.png link=\"no\" alt=\"\"]]"
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index 0bbce17..8f12233 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -32,8 +32,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -75,8 +75,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
#. type: Content of: <div><div><div><div><p><b>
@@ -293,26 +293,21 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
@@ -349,15 +344,6 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
@@ -406,11 +392,7 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
@@ -487,10 +469,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
@@ -559,8 +537,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -581,8 +559,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -593,20 +571,19 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -625,8 +602,8 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index 0b855f6..946df7e 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-29 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -34,11 +34,11 @@ msgstr "Téléchargement direct"
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Télécharger Tails"
#. type: Content of: <div><div><div><div><div>
#, fuzzy
@@ -117,12 +117,12 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Vérifiez votre téléchargement en "
-"utilisant votre navigateur"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Vérifiez votre téléchargement en utilisant "
+"votre navigateur"
#. type: Content of: <div><div><div><div><p><b>
msgid "<b>For your security,"
@@ -398,33 +398,40 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
#, fuzzy
#| msgid ""
-#| "<span class=\"step-number\"><span class=\"windows linux mac-usb "
-#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\""
-#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
-#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
-#| "upgrading</span>"
-msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
-msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"windows "
-"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
-"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
-"mise à jour</span>"
+#| "<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+#| "upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+#| "usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+#| "span> <span class=\"download-only\">installing or upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continuer <span class=\"windows linux mac-"
+"usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails\">la mise à "
+"jour</span> <span class=\"download-only\">l'installation ou la mise à jour</"
+"span>"
#. type: Content of: <div><div><div><div>
-msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
+#, fuzzy
+#| msgid ""
+#| "<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
+#| "\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
+#| "download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
+#| "usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> "
+#| "<span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+#| "\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span "
+#| "class=\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
+msgid ""
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
"<span class=\"debian\">[[Passer le téléchargement|debian/usb]]</span> <span "
"class=\"windows\">[[Passer le téléchargement|win/usb]]</span> <span class="
@@ -436,10 +443,6 @@ msgstr ""
"\">[[Passer le téléchargement|upgrade/tails]]</span>"
#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
-msgstr "[[Ignorer la vérification !|debian/usb]]"
-
-#. type: Content of: <div><div><div><div><div><div>
msgid "[[Skip verification!|win/usb]]"
msgstr "[[Ignorer la vérification !|win/usb]]"
@@ -473,17 +476,6 @@ msgstr "[["
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-"Ensuite : installer l'<em>Installeur de Tails</em> (<span class=\"next-"
-"counter\"></span>)"
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr "|debian/usb]]"
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
"Ensuite : installer un Tails intermédiaire (<span class=\"next-counter\"></"
@@ -534,12 +526,10 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr "[[Installer depuis Windows|install/win/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr "[[Installer depuis Debian, Ubuntu ou Mint|install/debian/usb]]"
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
-msgstr "[[Installer depuis d'autres distributions Linux|install/linux/usb]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
+msgstr "[[Installer depuis Windows|install/win/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
@@ -630,11 +620,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr "Copier et coller ce lien dans Firefox, Chrome ou le Navigateur Tor :"
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr ""
-"<code>https://tails.boum.org/install/debian/usb-download/index.fr.html</code>"
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
"<code>https://tails.boum.org/install/win/usb-download/index.fr.html</code>"
@@ -718,11 +703,11 @@ msgstr "BitTorrent ne fonctionne pas à travers Tor ou dans Tails."
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails (fichier Torrent)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Télécharger Tails (fichier Torrent)"
#. type: Content of: <div><div><div><div>
#, fuzzy
@@ -762,12 +747,12 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Vérifiez votre téléchargement en "
-"utilisant BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Vérifiez votre téléchargement en utilisant "
+"BitTorrent"
#. type: Content of: <div><div><div><p>
msgid ""
@@ -780,23 +765,22 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
#, fuzzy
#| msgid ""
-#| "<span class=\"step-number\"><span class=\"windows linux mac-usb "
-#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\""
-#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
-#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
-#| "upgrading</span>"
-msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
-msgstr ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"windows "
-"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
-"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
-"mise à jour</span>"
+#| "<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+#| "upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+#| "usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+#| "span> <span class=\"download-only\">installing or upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continuer <span class=\"windows linux mac-"
+"usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails\">la mise à "
+"jour</span> <span class=\"download-only\">l'installation ou la mise à jour</"
+"span>"
#. type: Content of: <div><div><div><p>
#, fuzzy
@@ -807,9 +791,8 @@ msgstr ""
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
"Ouvrez et télécharger le fichier Torrent avec votre client BitTorrent. Il "
"contient l'image ISO de Tails [[!inline pages=\"inc/stable_amd64_version\" "
@@ -840,8 +823,8 @@ msgstr "Téléchargement de la [[clé de signature Tails|tails-signing.key]]."
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -1370,6 +1353,30 @@ msgstr ""
"de signature Tails en la signant avec votre propre clé pour vous débarrasser "
"des avertissements durant le processus de vérification."
+#~ msgid "[[Skip verification!|debian/usb]]"
+#~ msgstr "[[Ignorer la vérification !|debian/usb]]"
+
+#~ msgid ""
+#~ "Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></"
+#~ "span>)"
+#~ msgstr ""
+#~ "Ensuite : installer l'<em>Installeur de Tails</em> (<span class=\"next-"
+#~ "counter\"></span>)"
+
+#~ msgid "|debian/usb]]"
+#~ msgstr "|debian/usb]]"
+
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+#~ msgstr "[[Installer depuis Debian, Ubuntu ou Mint|install/debian/usb]]"
+
+#~ msgid "[[Install from other Linux distributions|install/linux/usb]]"
+#~ msgstr "[[Installer depuis d'autres distributions Linux|install/linux/usb]]"
+
+#~ msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+#~ msgstr ""
+#~ "<code>https://tails.boum.org/install/debian/usb-download/index.fr.html</"
+#~ "code>"
+
#~ msgid ""
#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.it.po b/wiki/src/install/inc/steps/download.inline.it.po
index f73445e..d333118 100644
--- a/wiki/src/install/inc/steps/download.inline.it.po
+++ b/wiki/src/install/inc/steps/download.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -32,8 +32,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -103,8 +103,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
#. type: Content of: <div><div><div><div><p><b>
@@ -351,26 +351,21 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
@@ -407,15 +402,6 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
@@ -464,11 +450,7 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
@@ -545,10 +527,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
@@ -617,8 +595,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -661,8 +639,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -673,20 +651,19 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -712,8 +689,8 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index 20446c8..c42765e 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 14:06+0000\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,8 +33,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div>
@@ -76,8 +76,8 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
#. type: Content of: <div><div><div><div><p><b>
@@ -294,26 +294,21 @@ msgstr ""
#. type: Content of: <div><div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"windows "
-"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
-"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
-"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
-"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
-"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
-"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
-"tails\">[[Skip download|upgrade/tails]]</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid "[[Skip verification!|debian/usb]]"
+"<span class=\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux"
+"\">[[Skip download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
+"download|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</"
+"span> <span class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm"
+"\">[[Skip download|doc/advanced_topics/virtualization]]</span> <span class="
+"\"upgrade-tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
@@ -350,15 +345,6 @@ msgstr "[["
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div>
-msgid "|debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div>
-msgid ""
"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
@@ -407,11 +393,7 @@ msgid "[[Install from Windows|install/win/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Install from other Linux distributions|install/linux/usb]]"
+msgid "[[Install from Linux|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
@@ -488,10 +470,6 @@ msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
msgstr ""
@@ -560,8 +538,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -582,8 +560,8 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd "
+"upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -594,20 +572,19 @@ msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
-"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-"
-"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\""
-"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only-img download-only-iso"
-"\">installing or upgrading</span>"
+"<span class=\"step-number\"><span class=\"windows linux mac-usb mac-dvd dvd "
+"vm upgrade-tails\">1.</span>3</span>Continue <span class=\"windows linux mac-"
+"usb mac-dvd\">installing</span> <span class=\"upgrade-tails\">upgrading</"
+"span> <span class=\"download-only-img download-only-iso\">installing or "
+"upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] <span class=\"windows linux mac-usb mac-dvd upgrade-tails\">USB</"
-"span> <span class=\"windows linux mac-usb mac-dvd upgrade-tails"
-"\">ISO</span> image that you will use in the next step."
+"\"]] <span class=\"windows linux mac-usb upgrade-tails\">USB</span> <span "
+"class=\"mac-dvd dvd vm\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -626,8 +603,8 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Download the <a class=\"windows linux mac-usb upgrade-tails\" "
-"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"Download the <a class=\"windows linux mac-usb upgrade-tails\" href='[[!"
+"inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
diff --git a/wiki/src/install/inc/steps/install_final.inline.de.po b/wiki/src/install/inc/steps/install_final.inline.de.po
index 6afad9e..257a499 100644
--- a/wiki/src/install/inc/steps/install_final.inline.de.po
+++ b/wiki/src/install/inc/steps/install_final.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-03-05 03:13-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -57,14 +57,22 @@ msgstr ""
" <span class=\"application\">Tails Installers</span> installieren.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"upgrade\">\n"
+#| " In this step, you will upgrade your Tails from the\n"
+#| " <span class=\"upgrade-clone\">other</span>\n"
+#| " <span class=\"upgrade-tails\">intermediary</span>\n"
+#| " Tails using\n"
+#| " <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+#| "</p>\n"
msgid ""
"<p class=\"upgrade\">\n"
" In this step, you will upgrade your Tails from the\n"
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
"<p class=\"upgrade\">\n"
@@ -111,12 +119,6 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\"]]\n"
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\"]]\n"
@@ -137,13 +139,13 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
"Schließen Sie <span class=\"windows linux mac-usb\">den zweiten</span> <span "
"class=\"install-clone mac-clone\">den neuen</span> <span class=\"upgrade"
-"\">Ihren Tails</span> <span class=\"expert mac-dvd\">den</span> USB-"
-"Stick an Ihren Computer an."
+"\">Ihren Tails</span> <span class=\"expert mac-dvd\">den</span> USB-Stick an "
+"Ihren Computer an."
#. type: Plain text
#, no-wrap
@@ -179,12 +181,6 @@ msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
msgstr " <p>Starten Sie den <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-
-#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
@@ -222,12 +218,6 @@ msgstr " <div class=\"step-image\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
#| msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\"]]\n"
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\"]]\n"
@@ -241,16 +231,16 @@ msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-d
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
-#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and "
-#| "choose the ISO image that you downloaded earlier.</p>"
+#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and choose "
+#| "the ISO image that you downloaded earlier.</p>"
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
-"<p class=\"expert\">Klicken Sie auf <span class=\"button"
-"\">Durchsuchen</span> und wählen Sie das ISO-Image aus, das Sie zuvor "
-"heruntergeladen haben.</p>"
+"<p class=\"expert\">Klicken Sie auf <span class=\"button\">Durchsuchen</"
+"span> und wählen Sie das ISO-Image aus, das Sie zuvor heruntergeladen haben."
+"</p>"
#. type: Plain text
#, fuzzy, no-wrap
@@ -346,19 +336,6 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
-#| " <span class=\"debian\">At the end of the installation, you are asked\n"
-#| " for your administration password.</span>\n"
-msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-" Die\n"
-" <span class=\"debian\">Am Ende der Installation werden Sie nach\n"
-" Ihrem Administrationspasswort gefragt.</span>\n"
-
-#. type: Plain text
-#, fuzzy, 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"
@@ -403,16 +380,42 @@ msgstr "<p>Sie sind fertig mit der Aktualisierung von Tails. Sie können nun her
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Vielen Dank, dass Sie sicher bleiben!</p>\n"
+#, fuzzy
+#~| msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
+#~ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+#~ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
+#~ msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
+#~ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " <span class=\"debian\">At the end of the installation, you are asked\n"
+#~| " for your administration password.</span>\n"
+#~ msgid ""
+#~ " <span class=\"debian\">At the end of the installation, you are asked\n"
+#~ " for your administration password twice.</span>\n"
+#~ msgstr ""
+#~ " Die\n"
+#~ " <span class=\"debian\">Am Ende der Installation werden Sie nach\n"
+#~ " Ihrem Administrationspasswort gefragt.</span>\n"
+
#~ msgid ""
#~ "Click on the <span class=\"button windows linux mac install-clone"
-#~ "\">Install by cloning</span> <span class=\"button expert"
-#~ "\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</"
-#~ "span> button."
+#~ "\">Install by cloning</span> <span class=\"button expert\">Install</span> "
+#~ "<span class=\"button upgrade\">Upgrade by cloning</span> button."
#~ msgstr ""
#~ "Klicken Sie auf die Schaltfläche <span class=\"button windows linux mac "
-#~ "install-clone\">Install by cloning</span> <span class=\"button "
-#~ "expert\">Install</span> <span class=\"button upgrade\">Upgrade by "
-#~ "cloning</span>."
+#~ "install-clone\">Install by cloning</span> <span class=\"button expert"
+#~ "\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</"
+#~ "span>."
#~ msgid " <div class=\"note upgrade\">\n"
#~ msgstr " <div class=\"note upgrade\">\n"
diff --git a/wiki/src/install/inc/steps/install_final.inline.es.po b/wiki/src/install/inc/steps/install_final.inline.es.po
index cf2de9e..6f89fe7 100644
--- a/wiki/src/install/inc/steps/install_final.inline.es.po
+++ b/wiki/src/install/inc/steps/install_final.inline.es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-09 12:14+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -52,14 +52,22 @@ msgstr ""
" <span class=\"application\">Tails Installer</span>.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"upgrade\">\n"
+#| " In this step, you will upgrade your Tails from the\n"
+#| " <span class=\"upgrade-clone\">other</span>\n"
+#| " <span class=\"upgrade-tails\">intermediary</span>\n"
+#| " Tails using\n"
+#| " <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+#| "</p>\n"
msgid ""
"<p class=\"upgrade\">\n"
" In this step, you will upgrade your Tails from the\n"
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
"<p class=\"upgrade\">\n"
@@ -107,11 +115,6 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Memoria USB conectada a la derecha\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Segunda memoria USB conectada a la derecha\"]]\n"
@@ -129,13 +132,13 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
"Conecta <span class=\"windows linux mac-usb\">la segunda</span> <span class="
"\"install-clone mac-clone\">la nueva</span> <span class=\"upgrade\">tu "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> memoria USB en "
-"la computadora."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> memoria USB en la "
+"computadora."
#. type: Plain text
#, no-wrap
@@ -171,12 +174,6 @@ msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
msgstr " <p>Inicia el <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
-
-#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
@@ -214,11 +211,6 @@ msgstr " <div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"Imagen ISO instalada en una memoria USB a la derecha\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails instalado en una memoria USB a la derecha\"]]\n"
@@ -230,15 +222,15 @@ msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-d
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
-#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and "
-#| "choose the ISO image that you downloaded earlier.</p>"
+#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and choose "
+#| "the ISO image that you downloaded earlier.</p>"
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
-"<p class=\"expert\">Haz click en <span class=\"button\">Explorar</"
-"span> y elige la imagen ISO que descargaste previamente.</p>"
+"<p class=\"expert\">Haz click en <span class=\"button\">Explorar</span> y "
+"elige la imagen ISO que descargaste previamente.</p>"
#. type: Plain text
#, no-wrap
@@ -326,15 +318,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-" <span class=\"debian\">Al final de la instalación, se te pregunta\n"
-" por tu contraseña de administrador dos veces.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" <div class=\"bug\">\n"
" <p>The progress bar usually freezes for some time\n"
" while synchronizing data on disk.</p>\n"
@@ -373,11 +356,28 @@ msgstr "<p>Terminaste de actualizar Tails. Ya puedes apagar y reiniciar en tu me
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>¡Gracias por mantenerte seguro!</p>\n"
+#~ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Memoria USB conectada a la derecha\"]]\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+#~ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+
+#~ msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
+#~ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"Imagen ISO instalada en una memoria USB a la derecha\"]]\n"
+
+#~ msgid ""
+#~ " <span class=\"debian\">At the end of the installation, you are asked\n"
+#~ " for your administration password twice.</span>\n"
+#~ msgstr ""
+#~ " <span class=\"debian\">Al final de la instalación, se te pregunta\n"
+#~ " por tu contraseña de administrador dos veces.</span>\n"
+
#~ msgid ""
#~ "Click on the <span class=\"button windows linux mac install-clone"
-#~ "\">Install by cloning</span> <span class=\"button expert"
-#~ "\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</"
-#~ "span> button."
+#~ "\">Install by cloning</span> <span class=\"button expert\">Install</span> "
+#~ "<span class=\"button upgrade\">Upgrade by cloning</span> button."
#~ msgstr ""
#~ "Haz click en el botón <span class=\"button windows linux mac install-clone"
#~ "\">Instalación por clonación</span> <span class=\"button expert"
diff --git a/wiki/src/install/inc/steps/install_final.inline.fa.po b/wiki/src/install/inc/steps/install_final.inline.fa.po
index 707a499..dbc7d09 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fa.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -46,7 +46,7 @@ msgid ""
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
@@ -87,11 +87,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr ""
@@ -109,8 +104,8 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
#. type: Plain text
@@ -139,11 +134,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"expert\">\n"
" <pre><code>tails-installer</code></pre>\n"
@@ -177,11 +167,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr ""
@@ -192,9 +177,9 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
#. type: Plain text
@@ -256,13 +241,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" <div class=\"bug\">\n"
" <p>The progress bar usually freezes for some time\n"
" while synchronizing data on disk.</p>\n"
diff --git a/wiki/src/install/inc/steps/install_final.inline.fr.po b/wiki/src/install/inc/steps/install_final.inline.fr.po
index 152ccb9..e6e0dfb 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-08-07 13:17+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -51,14 +51,22 @@ msgstr ""
" l'<span class=\"application\">Installeur de Tails</span>.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"upgrade\">\n"
+#| " In this step, you will upgrade your Tails from the\n"
+#| " <span class=\"upgrade-clone\">other</span>\n"
+#| " <span class=\"upgrade-tails\">intermediary</span>\n"
+#| " Tails using\n"
+#| " <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+#| "</p>\n"
msgid ""
"<p class=\"upgrade\">\n"
" In this step, you will upgrade your Tails from the\n"
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
"<p class=\"upgrade\">\n"
@@ -107,11 +115,6 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Clé USB branchée sur la droite\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
@@ -129,13 +132,13 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
"Connecter <span class=\"windows linux mac-usb\">la seconde</span> <span "
"class=\"install-clone mac-clone\">la nouvelle</span> <span class=\"upgrade"
-"\">votre</span> <span class=\"expert mac-dvd\">la</span> clé USB "
-"<span class=\"upgrade\">Tails </span>sur l'ordinateur."
+"\">votre</span> <span class=\"expert mac-dvd\">la</span> clé USB <span class="
+"\"upgrade\">Tails </span>sur l'ordinateur."
#. type: Plain text
#, no-wrap
@@ -172,11 +175,6 @@ msgstr " <p>Démarrer l'<span class=\"application\">Installeur de Tails</span>
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"expert\">\n"
" <pre><code>tails-installer</code></pre>\n"
@@ -213,11 +211,6 @@ msgstr " <div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"Image ISO installée sur la clé USB sur la droite\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
@@ -228,12 +221,12 @@ msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-d
#. type: Bullet: '1. '
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
-"<p class=\"expert\">Cliquer sur <span class=\"button\">(Aucun) [[!img "
-"lib/document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> et "
+"<p class=\"expert\">Cliquer sur <span class=\"button\">(Aucun) [[!img lib/"
+"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> et "
"choisir l'image ISO que vous avez téléchargé plus tôt.</p>"
#. type: Plain text
@@ -322,15 +315,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-" <span class=\"debian\">À la fin de l'installation, il vous sera demandé\n"
-" votre mot de passe d'administration deux fois.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" <div class=\"bug\">\n"
" <p>The progress bar usually freezes for some time\n"
" while synchronizing data on disk.</p>\n"
@@ -369,11 +353,26 @@ msgstr "<p>Vous avez fini la mise à jour de Tails. Vous pouvez maintenant étei
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Merci de prendre soin de vous !</p>\n"
+#~ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"Clé USB branchée sur la droite\"]]\n"
+
+#~ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+
+#~ msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
+#~ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"Image ISO installée sur la clé USB sur la droite\"]]\n"
+
+#~ msgid ""
+#~ " <span class=\"debian\">At the end of the installation, you are asked\n"
+#~ " for your administration password twice.</span>\n"
+#~ msgstr ""
+#~ " <span class=\"debian\">À la fin de l'installation, il vous sera demandé\n"
+#~ " votre mot de passe d'administration deux fois.</span>\n"
+
#~ msgid ""
#~ "Click on the <span class=\"button windows linux mac install-clone"
-#~ "\">Install by cloning</span> <span class=\"button expert"
-#~ "\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</"
-#~ "span> button."
+#~ "\">Install by cloning</span> <span class=\"button expert\">Install</span> "
+#~ "<span class=\"button upgrade\">Upgrade by cloning</span> button."
#~ msgstr ""
#~ "Cliquer sur le bouton <span class=\"button windows linux mac install-clone"
#~ "\">Installation par clonage</span> <span class=\"button expert"
diff --git a/wiki/src/install/inc/steps/install_final.inline.it.po b/wiki/src/install/inc/steps/install_final.inline.it.po
index 64ee11b..ce904be 100644
--- a/wiki/src/install/inc/steps/install_final.inline.it.po
+++ b/wiki/src/install/inc/steps/install_final.inline.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails 1\n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-09-02 14:25+0200\n"
"Last-Translator: ignifugo <ignifugo@insicuri.net>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -51,14 +51,22 @@ msgstr ""
" <span class=\"application\">l'installatore di Tails</span>.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"upgrade\">\n"
+#| " In this step, you will upgrade your Tails from the\n"
+#| " <span class=\"upgrade-clone\">other</span>\n"
+#| " <span class=\"upgrade-tails\">intermediary</span>\n"
+#| " Tails using\n"
+#| " <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+#| "</p>\n"
msgid ""
"<p class=\"upgrade\">\n"
" In this step, you will upgrade your Tails from the\n"
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
"<p class=\"upgrade\">\n"
@@ -106,11 +114,6 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr ""
@@ -128,13 +131,13 @@ msgstr ""
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
"Inserisci <span class=\"windows linux mac-usb\">la seconda</span> <span "
"class=\"install-clone mac-clone\">la nuova</span> <span class=\"upgrade"
-"\">chiavetta USB con la tua Tails</span> <span class=\"expert mac-dvd"
-"\">nel</span> computer."
+"\">chiavetta USB con la tua Tails</span> <span class=\"expert mac-dvd\">nel</"
+"span> computer."
#. type: Plain text
#, no-wrap
@@ -171,11 +174,6 @@ msgstr " <p>Avvia <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
" <div class=\"expert\">\n"
" <pre><code>tails-installer</code></pre>\n"
@@ -209,11 +207,6 @@ msgstr " <div class=\"step-image\">\n"
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr ""
@@ -225,15 +218,15 @@ msgstr ""
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
-#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and "
-#| "choose the ISO image that you downloaded earlier.</p>"
+#| "<p class=\"expert\">Click <span class=\"button\">Browse</span> and choose "
+#| "the ISO image that you downloaded earlier.</p>"
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
-"<p class=\"expert\">Clicca <span class=\"button\">Browse</span> e "
-"scegli l'immagine ISO che hai scaricato e verificato prima.</p>"
+"<p class=\"expert\">Clicca <span class=\"button\">Browse</span> e scegli "
+"l'immagine ISO che hai scaricato e verificato prima.</p>"
#. type: Plain text
#, fuzzy, no-wrap
@@ -326,15 +319,6 @@ msgstr ""
" durerà alcuni minuti.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-" <span class=\"debian\">Alla fine dell'installazione, ti verrà chiesta\n"
-" la tua password di amministrazione.</span>\n"
-
-#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"bug\">\n"
@@ -375,15 +359,22 @@ msgstr "<p>Hai aggiornato Tails. Ora puoi spegnere e riavviare utilizzando la tu
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Grazie di stare al sicuro con Tails!</p>\n"
+#, fuzzy
+#~ msgid ""
+#~ " <span class=\"debian\">At the end of the installation, you are asked\n"
+#~ " for your administration password twice.</span>\n"
+#~ msgstr ""
+#~ " <span class=\"debian\">Alla fine dell'installazione, ti verrà chiesta\n"
+#~ " la tua password di amministrazione.</span>\n"
+
#~ msgid ""
#~ "Click on the <span class=\"button windows linux mac install-clone"
-#~ "\">Install by cloning</span> <span class=\"button expert"
-#~ "\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</"
-#~ "span> button."
+#~ "\">Install by cloning</span> <span class=\"button expert\">Install</span> "
+#~ "<span class=\"button upgrade\">Upgrade by cloning</span> button."
#~ msgstr ""
#~ "Clicca su <span class=\"button windows linux mac install-clone\">Installa "
-#~ "tramite clonazione</span> <span class=\"button expert\">Installa</"
-#~ "span> <span class=\"button upgrade\">Aggiorna tramite clonazione</span>."
+#~ "tramite clonazione</span> <span class=\"button expert\">Installa</span> "
+#~ "<span class=\"button upgrade\">Aggiorna tramite clonazione</span>."
#~ msgid " <div class=\"note upgrade\">\n"
#~ msgstr " <div class=\"note upgrade\">\n"
diff --git a/wiki/src/install/inc/steps/install_final.inline.pt.po b/wiki/src/install/inc/steps/install_final.inline.pt.po
index 66a0042..8549f6e 100644
--- a/wiki/src/install/inc/steps/install_final.inline.pt.po
+++ b/wiki/src/install/inc/steps/install_final.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-08-01 13:56+0200\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-04-30 12:36-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -53,14 +53,22 @@ msgstr ""
# Mantive "Tails Installer"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"upgrade\">\n"
+#| " In this step, you will upgrade your Tails from the\n"
+#| " <span class=\"upgrade-clone\">other</span>\n"
+#| " <span class=\"upgrade-tails\">intermediary</span>\n"
+#| " Tails using\n"
+#| " <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+#| "</p>\n"
msgid ""
"<p class=\"upgrade\">\n"
" In this step, you will upgrade your Tails from the\n"
" <span class=\"upgrade-clone\">other</span>\n"
" <span class=\"upgrade-tails\">intermediary</span>\n"
" Tails using\n"
-" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> one last time</span>.\n"
+" <span class=\"application\">Tails Installer</span>.\n"
"</p>\n"
msgstr ""
"<p class=\"upgrade\">\n"
@@ -108,12 +116,6 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
-msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
-msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\"]]\n"
msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb clone\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\"]]\n"
@@ -134,12 +136,12 @@ msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"
msgid ""
"Plug <span class=\"windows linux mac-usb\">the second</span> <span class="
"\"install-clone mac-clone\">the new</span> <span class=\"upgrade\">your "
-"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in "
-"the computer."
+"Tails</span> <span class=\"expert mac-dvd\">the</span> USB stick in the "
+"computer."
msgstr ""
"Insira <span class=\"windows linux mac-usb\">a segunda</span> <span class="
-"\"install-clone mac-clone\">a nova</span> <span class=\"expert mac-dvd"
-"\">a</span> unidade USB <span class=\"upgrade\">Tails</span> no computador."
+"\"install-clone mac-clone\">a nova</span> <span class=\"expert mac-dvd\">a</"
+"span> unidade USB <span class=\"upgrade\">Tails</span> no computador."
# Mantive "Tails Installer"
#. type: Plain text
@@ -176,12 +178,6 @@ msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
msgstr " <p>Inicie o <span class=\"application\">Tails Installer</span>:</p>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
-
-#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
@@ -219,12 +215,6 @@ msgstr " <div class=\"step-image\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
-msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
-msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
#| msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\"]]\n"
msgid " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\" alt=\"Tails installed on USB stick on the right\"]]\n"
msgstr " [[!img install/inc/infography/clone-intermediary-tails.png link=\"no\" class=\"windows linux mac-usb clone upgrade-tails\"]]\n"
@@ -238,12 +228,12 @@ msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-d
#. type: Bullet: '1. '
#, fuzzy
msgid ""
-"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/"
-"document-open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and "
-"choose the ISO image that you downloaded earlier.</p>"
+"<p class=\"expert\">Click <span class=\"button\">(None) [[!img lib/document-"
+"open.png alt=\"Menu\" class=symbolic link=\"no\"]]</span> and choose the ISO "
+"image that you downloaded earlier.</p>"
msgstr ""
-"<p class=\"expert\">Clique em <span class=\"button\">Browse</span> e "
-"escolha a imagem ISO que você obteve anteriormente.</p>"
+"<p class=\"expert\">Clique em <span class=\"button\">Browse</span> e escolha "
+"a imagem ISO que você obteve anteriormente.</p>"
#. type: Plain text
#, fuzzy, no-wrap
@@ -269,8 +259,8 @@ msgid ""
"\">Upgrade</span> button.</span>"
msgstr ""
"Clique no botão <span class=\"button windows linux mac install-clone"
-"\">Install by cloning</span> <span class=\"button expert\">Install</"
-"span> <span class=\"button upgrade\">Upgrade by cloning</span>."
+"\">Install by cloning</span> <span class=\"button expert\">Install</span> "
+"<span class=\"button upgrade\">Upgrade by cloning</span>."
#. type: Plain text
#, no-wrap
@@ -313,13 +303,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <span class=\"debian\">At the end of the installation, you are asked\n"
-" for your administration password twice.</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" <div class=\"bug\">\n"
" <p>The progress bar usually freezes for some time\n"
" while synchronizing data on disk.</p>\n"
@@ -354,3 +337,18 @@ msgstr ""
#, no-wrap
msgid "<p>Thank you for staying safe!</p>\n"
msgstr ""
+
+#, fuzzy
+#~| msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
+#~ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" alt=\"USB stick plugged on the right\"]]\n"
+#~ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]]\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+#~ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+
+#, fuzzy
+#~| msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
+#~ msgid " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\" alt=\"ISO image installed on USB stick on the right\"]]\n"
+#~ msgstr " [[!img install/inc/infography/install-tails.png link=\"no\" class=\"debian\"]]\n"
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 1625538..d42f8cd 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
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-08-22 18:18+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -16,79 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"Installing Tails on a USB stick from Linux\"]]\n"
-msgid "[[!meta title=\"Install from Linux\"]]\n"
-msgstr "[[!meta title=\"Tails unter Linux auf einen USB-Stick installieren\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"hidden-step-1\"></div>\n"
-msgstr "<div class=\"hidden-step-1\"></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p class=\"start\">Start in Linux.</p>\n"
-msgstr "<p class=\"start\">Starten Sie unter Linux.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr "Installieren Sie <span class=\"application\">GNOME Disks</span>."
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-"Wenn Sie die GNOME-Arbeitsumgebung benutzen, sollte <span class=\"application"
-"\">GNOME Disks</span> standardmäßig installiert sein."
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-"Installieren Sie ansonsten das Paket <span class=\"code\">gnome-disk-"
-"utility</span> unter Nutzung der gewohnten Installationsweise für Ihre Linux-"
-"Distribution."
-
#. type: Bullet: '1. '
msgid ""
"Start <span class=\"application\">GNOME Disks</span> (also called <span "
@@ -98,12 +25,24 @@ msgstr ""
"\"application\">Laufwerke</span> genannt)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " For example, you can choose <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disks</span></span>.\n"
msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
msgstr ""
" Zum Beispiel können Sie <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
@@ -115,13 +54,12 @@ msgstr ""
msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
+#, fuzzy
+#| msgid "Plug the first USB stick in the computer."
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
msgstr "Schließen Sie den ersten USB-Stick an den Computer an."
#. type: Plain text
@@ -134,11 +72,6 @@ msgstr " Ein neues Laufwerk erscheint im linken Fensterbereich. Klicken Sie da
msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
@@ -163,168 +96,44 @@ msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
+#| msgid "If you are using the GNOME desktop environment, <span class=\"application\">GNOME Disks</span> should be installed by default."
msgid ""
" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
-" Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
-" vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
-" der Kommandozeile installieren\"]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+" old it might have a\n"
+msgstr "Wenn Sie die GNOME-Arbeitsumgebung benutzen, sollte <span class=\"application\">GNOME Disks</span> standardmäßig installiert sein."
#. type: Plain text
#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+msgid " [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
msgstr ""
-" <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
-" Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
-" vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
-" der Kommandozeile installieren\"]].</p>\n"
#. type: Plain text
#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Ein zwischenzeitliches Tails unter Nutzung der Kommandozeile installieren\n"
-" ----------------------------------------------------\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
+msgid " button instead. Click on the\n"
msgstr ""
-"Notieren Sie sich den *Gerätenamen* des im rechten Fensterbereich "
-"angezeigten, ersten USB-Sticks. Der Gerätename sollte etwa wie `/dev/sdb`, `/"
-"dev/sdc`, usw. lauten."
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Falls Sie sich über den Gerätenamen unsicher sind, sollten Sie den Vorgang\n"
-" abbrechen. Anderenfalls riskieren Sie, jegliche Datenträger des Systems zu überschreiben.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Öffnen Sie ein Terminal."
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Führen Sie folgenden Befehl aus und ersetzen Sie `[tails.iso]` mit dem Pfad "
-"zum ISO-Image, das Sie installieren wollen und `[gerät]` mit dem "
-"Gerätenamen, den Sie im ersten Schritt herausgefunden haben."
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[gerät] bs=16M && sync\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Hier ist ein Beispiel des auszuführenden Befehls, Ihrer ist wahrscheinlich anders:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Falls Sie sich nicht über den Pfad zum ISO-Image sicher sind oder Sie eine <span\n"
-" class=\"guilabel\">Datei oder Verzeichnis nicht gefunden</span> Fehlermeldung erhalten,\n"
-" können Sie zuerst <code>dd</code> gefolgt von einem Leerzeichen eingeben und dann das Symbol\n"
-" des ISO-Images per Drag and Drop aus einem Datei-Browser in das Terminal ziehen. Dies sollte den\n"
-" korrekten Pfad zum ISO-Image in das Terminal einfügen. Vervollständigen Sie anschließend den Befehl\n"
-" und führen Sie ihn aus.</p>\n"
-
-#. type: Bullet: ' 1. '
+#, fuzzy, no-wrap
+#| msgid "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] button in the titlebar and choose <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Falls keine Fehlermeldung zurückgegeben wird, wird Tails auf den USB-Stick "
-"installiert.\n"
-"Die Installation dauert einige Minuten."
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
+msgstr "Klicken Sie in der Titelleiste des Fensters auf die Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] und wählen Sie <span class=\"guimenuitem\">Laufwerksabbild wiederherstellen&hellip;</span>."
#. type: Plain text
#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Sie können nun mit dem nächsten Schritt fortfahren und [[diese Anweisungen\n"
-" auf einem anderen Gerät öffnen|usb#intermediary]].\n"
+msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#| "on the file selector button and choose the ISO image that you downloaded "
+#| "earlier."
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
+"the file selector button and choose the USB disk image that you downloaded "
"earlier."
msgstr ""
"Klicken Sie im Fenster <span class=\"guilabel\">Laufwerksabbild "
@@ -339,8 +148,12 @@ msgstr ""
"starten&hellip;</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#| "The installation takes a few minutes."
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
"installation takes a few minutes."
msgstr ""
"Klicken Sie im Bestätigunsfenster auf <span class=\"button"
@@ -354,30 +167,196 @@ msgstr ""
"Klicken Sie auf die Schaltfläche [[!img lib/media-eject.png alt=\"Eject\" "
"class=\"symbolic\" link=\"no\"]], nachdem die Installation beendet wurde."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#, fuzzy
+#~| msgid "[[!meta title=\"Installing Tails on a USB stick from Linux\"]]\n"
+#~ msgid "[[!meta title=\"Install from Linux\"]]\n"
+#~ msgstr "[[!meta title=\"Tails unter Linux auf einen USB-Stick installieren\"]]\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.de\" raw=\"yes\" sort=\"age\"]]\n"
+#, fuzzy
+#~| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\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 "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "<div class=\"hidden-step-1\"></div>\n"
+#~ msgstr "<div class=\"hidden-step-1\"></div>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "<p class=\"start\">Start in Linux.</p>\n"
+#~ msgstr "<p class=\"start\">Starten Sie unter Linux.</p>\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Install <span class=\"application\">GNOME Disks</span>."
+#~ msgstr "Installieren Sie <span class=\"application\">GNOME Disks</span>."
+
+#~ msgid ""
+#~ "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#~ "package using the usual installation method for your Linux distribution."
+#~ msgstr ""
+#~ "Installieren Sie ansonsten das Paket <span class=\"code\">gnome-disk-"
+#~ "utility</span> unter Nutzung der gewohnten Installationsweise für Ihre "
+#~ "Linux-Distribution."
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
+#~ " Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
+#~ " vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
+#~ " der Kommandozeile installieren\"]].</p>\n"
+
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
+#~ " Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
+#~ " vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
+#~ " der Kommandozeile installieren\"]].</p>\n"
+
+#~ msgid " </div>\n"
+#~ msgstr " </div>\n"
+
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Ein zwischenzeitliches Tails unter Nutzung der Kommandozeile installieren\n"
+#~ " ----------------------------------------------------\n"
+
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Notieren Sie sich den *Gerätenamen* des im rechten Fensterbereich "
+#~ "angezeigten, ersten USB-Sticks. Der Gerätename sollte etwa wie `/dev/"
+#~ "sdb`, `/dev/sdc`, usw. lauten."
+
+#~ msgid " <div class=\"caution\">\n"
+#~ msgstr " <div class=\"caution\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Sie sich über den Gerätenamen unsicher sind, sollten Sie den Vorgang\n"
+#~ " abbrechen. Anderenfalls riskieren Sie, jegliche Datenträger des Systems zu überschreiben.</p>\n"
+
+#~ msgid "Open a terminal."
+#~ msgstr "Öffnen Sie ein Terminal."
+
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Führen Sie folgenden Befehl aus und ersetzen Sie `[tails.iso]` mit dem "
+#~ "Pfad zum ISO-Image, das Sie installieren wollen und `[gerät]` mit dem "
+#~ "Gerätenamen, den Sie im ersten Schritt herausgefunden haben."
+
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[gerät] bs=16M && sync\n"
+
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Hier ist ein Beispiel des auszuführenden Befehls, Ihrer ist wahrscheinlich anders:\n"
+
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Sie sich nicht über den Pfad zum ISO-Image sicher sind oder Sie eine <span\n"
+#~ " class=\"guilabel\">Datei oder Verzeichnis nicht gefunden</span> Fehlermeldung erhalten,\n"
+#~ " können Sie zuerst <code>dd</code> gefolgt von einem Leerzeichen eingeben und dann das Symbol\n"
+#~ " des ISO-Images per Drag and Drop aus einem Datei-Browser in das Terminal ziehen. Dies sollte den\n"
+#~ " korrekten Pfad zum ISO-Image in das Terminal einfügen. Vervollständigen Sie anschließend den Befehl\n"
+#~ " und führen Sie ihn aus.</p>\n"
+
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Falls keine Fehlermeldung zurückgegeben wird, wird Tails auf den USB-"
+#~ "Stick installiert.\n"
+#~ "Die Installation dauert einige Minuten."
+
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Sie können nun mit dem nächsten Schritt fortfahren und [[diese Anweisungen\n"
+#~ " auf einem anderen Gerät öffnen|usb#intermediary]].\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.de\" raw=\"yes\" sort=\"age\"]]\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.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ 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/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
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 4383a10..9633b8e 100755
--- 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
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-linux-usb/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-linux-usb/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,76 +18,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.10.1\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Install from Linux\"]]\n"
-msgstr "[[!meta title=\"Instalar desde Linux\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta robots=\"noindex\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"hidden-step-1\"></div>\n"
-msgstr "<div class=\"hidden-step-1\"></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p class=\"start\">Start in Linux.</p>\n"
-msgstr "<p class=\"start\">Empezar en Linux.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr "Instalar <span class=\"application\">GNOME Disks</span>."
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-"Si utilizas el entorno de escritorio GNOME, <span class=\"application"
-"\">Discos de GNOME</span> debería venir instalado por defecto."
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-"Si no, instala el paquete <span class=\"code\">gnome-disk-utility</span> "
-"utilizando el método habitual de instalación para tu distribución Linux."
-
#. type: Bullet: '1. '
msgid ""
"Start <span class=\"application\">GNOME Disks</span> (also called <span "
@@ -97,12 +27,24 @@ msgstr ""
"<span class=\"application\">Discos</span>)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " For example, you can choose <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disks</span></span>.\n"
msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
msgstr ""
" Por ejemplo, puedes elegir <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Aplicaciones</span>&nbsp;▸\n"
@@ -114,13 +56,12 @@ msgstr ""
msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
+#, fuzzy
+#| msgid "Plug the first USB stick in the computer."
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
msgstr "Conecta la primer memoria USB a la computadora."
#. type: Plain text
@@ -133,11 +74,6 @@ msgstr " Una nueva unidad de disco aparece en el panel de la izquierda. Haz cl
msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
msgid ""
"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
@@ -154,159 +90,45 @@ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"
msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "If you are using the GNOME desktop environment, <span class=\"application\">GNOME Disks</span> should be installed by default."
msgid ""
" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" Si tu versión de <span class=\"application\">Discos de GNOME</span> es vieja\n"
-" puede que tenga el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" en su lugar. Si es así, haz click en el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" y elige <span class=\"guimenuitem\">Restaurar Imagen de Disco&hellip;</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+" old it might have a\n"
+msgstr "Si utilizas el entorno de escritorio GNOME, <span class=\"application\">Discos de GNOME</span> debería venir instalado por defecto."
#. type: Plain text
#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+msgid " [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
msgstr ""
-" <p>Si tu versión de <span class=\"application\">Discos de GNOME</span> es todavía más vieja\n"
-" y no tiene el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] ni\n"
-" el [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" deberás [[!toggle id=\"dd\" text=\"instalar un Tails intermedio\n"
-" usando la línea de comandos\"]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
+msgid " button instead. Click on the\n"
msgstr ""
-" Instalar un Tails intermedio utilizando la línea de comandos\n"
-" ------------------------------------------------------------\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-"Toma nota del *nombre del dispositivo* de la primera memoria USB que se "
-"muestra en el panel de la derecha. El nombre del dispositivo debería ser "
-"algo así como `/dev/sdb`, `/dev/sdc`, etc."
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Si no estás seguro del nombre del dispositivo, deberías dejar de proceder\n"
-" o te arriesgas a sobrescribir cualquier disco rígido de tu computadora.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Abre una terminal."
-
-#. type: Bullet: ' 1. '
+#, fuzzy, no-wrap
+#| 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>."
msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Ejecuta el siguiente comando, reemplazando `[tails.iso]` por la ruta de la "
-"imagen ISO que quieres instalar y `[dispositivo]` con el nombre del "
-"dispositivo que anotaste en el paso 1."
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[dispositivo] bs=16M && sync\n"
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
+msgstr "Click en el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] de la barra de título y elige <span class=\"guimenuitem\">Restaurar Imagen de Disco&hellip;</span>."
#. type: Plain text
#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Aquí hay un ejemplo del comando a ejecutar, el tuyo probablemente será diferente:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Si no estás seguro de la ruta de la imagen ISO o si recibes un mensaje de error <span\n"
-" class=\"guilabel\">No se ha encontrado el archivo o carpeta</span>, puedes escribir\n"
-" primero <code>dd</code>, seguido por un espacio, y luego arrastrar\n"
-" el ícono de la imagen ISO desde el explorador de archivos hasta la terminal. Haciendo eso\n"
-" deberías poder insertar la ruta correcta de la imagen ISO a la terminal. Luego completa el\n"
-" comando y ejecútalo.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Si no recibes ningún mensaje de error, Tails está siendo instalado en la "
-"memoria USB. La instalación dura un par de minutos."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Puedes continuar ahora con el paso siguiente y [[Abrir estas instrucciones en\n"
-" otro dispositivo|usb#intermediary]].\n"
+msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#| "on the file selector button and choose the ISO image that you downloaded "
+#| "earlier."
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
+"the file selector button and choose the USB disk image that you downloaded "
"earlier."
msgstr ""
"En el mensaje de diálogo <span class=\"guimenuitem\">Restaurar la Imagen de "
@@ -321,8 +143,12 @@ msgstr ""
"span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#| "The installation takes a few minutes."
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
"installation takes a few minutes."
msgstr ""
"En la ventana de confirmación, haz click en <span class=\"button"
@@ -336,38 +162,179 @@ msgstr ""
"Luego de que la instalación ha terminado, haz click en el botón [[!img lib/"
"media-eject.png alt=\"Expulsar\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta title=\"Install from Linux\"]]\n"
+#~ msgstr "[[!meta title=\"Instalar desde Linux\"]]\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 "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta robots=\"noindex\"]]\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.es\" raw=\"yes\" "
-"sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/restart_second_time.inline.es\" raw=\""
-"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/create_persistence.inline.es\" raw=\""
-"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "<div class=\"hidden-step-1\"></div>\n"
+#~ msgstr "<div class=\"hidden-step-1\"></div>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "<p class=\"start\">Start in Linux.</p>\n"
+#~ msgstr "<p class=\"start\">Empezar en Linux.</p>\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Install <span class=\"application\">GNOME Disks</span>."
+#~ msgstr "Instalar <span class=\"application\">GNOME Disks</span>."
+
+#~ msgid ""
+#~ "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#~ "package using the usual installation method for your Linux distribution."
+#~ msgstr ""
+#~ "Si no, instala el paquete <span class=\"code\">gnome-disk-utility</span> "
+#~ "utilizando el método habitual de instalación para tu distribución Linux."
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " Si tu versión de <span class=\"application\">Discos de GNOME</span> es vieja\n"
+#~ " puede que tenga el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " en su lugar. Si es así, haz click en el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " y elige <span class=\"guimenuitem\">Restaurar Imagen de Disco&hellip;</span>.\n"
+
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
+
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Si tu versión de <span class=\"application\">Discos de GNOME</span> es todavía más vieja\n"
+#~ " y no tiene el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] ni\n"
+#~ " el [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " deberás [[!toggle id=\"dd\" text=\"instalar un Tails intermedio\n"
+#~ " usando la línea de comandos\"]].</p>\n"
+
+#~ msgid " </div>\n"
+#~ msgstr " </div>\n"
+
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Instalar un Tails intermedio utilizando la línea de comandos\n"
+#~ " ------------------------------------------------------------\n"
+
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Toma nota del *nombre del dispositivo* de la primera memoria USB que se "
+#~ "muestra en el panel de la derecha. El nombre del dispositivo debería ser "
+#~ "algo así como `/dev/sdb`, `/dev/sdc`, etc."
+
+#~ msgid " <div class=\"caution\">\n"
+#~ msgstr " <div class=\"caution\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Si no estás seguro del nombre del dispositivo, deberías dejar de proceder\n"
+#~ " o te arriesgas a sobrescribir cualquier disco rígido de tu computadora.</p>\n"
+
+#~ msgid "Open a terminal."
+#~ msgstr "Abre una terminal."
+
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Ejecuta el siguiente comando, reemplazando `[tails.iso]` por la ruta de "
+#~ "la imagen ISO que quieres instalar y `[dispositivo]` con el nombre del "
+#~ "dispositivo que anotaste en el paso 1."
+
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[dispositivo] bs=16M && sync\n"
+
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Aquí hay un ejemplo del comando a ejecutar, el tuyo probablemente será diferente:\n"
+
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Si no estás seguro de la ruta de la imagen ISO o si recibes un mensaje de error <span\n"
+#~ " class=\"guilabel\">No se ha encontrado el archivo o carpeta</span>, puedes escribir\n"
+#~ " primero <code>dd</code>, seguido por un espacio, y luego arrastrar\n"
+#~ " el ícono de la imagen ISO desde el explorador de archivos hasta la terminal. Haciendo eso\n"
+#~ " deberías poder insertar la ruta correcta de la imagen ISO a la terminal. Luego completa el\n"
+#~ " comando y ejecútalo.</p>\n"
+
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Si no recibes ningún mensaje de error, Tails está siendo instalado en la "
+#~ "memoria USB. La instalación dura un par de minutos."
+
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Puedes continuar ahora con el paso siguiente y [[Abrir estas instrucciones en\n"
+#~ " otro dispositivo|usb#intermediary]].\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.es\" raw=\"yes\" sort=\"age\"]]\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"
+
+#~ 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/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title="
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 073b439..3cad4c0 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-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -16,72 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Install from Linux\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"hidden-step-1\"></div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<p class=\"start\">Start in Linux.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-
#. type: Bullet: '1. '
msgid ""
"Start <span class=\"application\">GNOME Disks</span> (also called <span "
@@ -91,10 +25,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
msgstr ""
#. type: Plain text
@@ -102,13 +43,10 @@ msgstr ""
msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
msgstr ""
#. type: Plain text
@@ -121,11 +59,6 @@ msgstr ""
msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
#. type: Bullet: '1. '
msgid ""
"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
@@ -142,127 +75,35 @@ msgstr ""
#, no-wrap
msgid ""
" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
+" old it might have a\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+msgid " [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"bug\">\n"
+msgid " button instead. Click on the\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
+msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
msgstr ""
#. type: Bullet: '1. '
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
+"the file selector button and choose the USB disk image that you downloaded "
"earlier."
msgstr ""
@@ -273,7 +114,7 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
"installation takes a few minutes."
msgstr ""
@@ -282,28 +123,3 @@ msgid ""
"After the installation is finished, click on the [[!img lib/media-eject.png "
"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
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 4f85a0a..12db67d 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
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-05-31 15:07-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -16,76 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Install from Linux\"]]\n"
-msgstr "[[!meta title=\"Installer depuis Linux\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta robots=\"noindex\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"hidden-step-1\"></div>\n"
-msgstr "<div class=\"hidden-step-1\"></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p class=\"start\">Start in Linux.</p>\n"
-msgstr "<p class=\"start\">Démarrez Linux.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr "Installez <span class=\"application\">GNOME Disks</span>."
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-"Si vous utilisez l'environnement de bureau GNOME, <span class=\"application"
-"\">GNOME Disks</span> devrait être installé par défaut."
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-"Sinon, installez le paquet <span class=\"code\">gnome-disk-utility</span> en "
-"utilisant la méthode habituelle d'installation de votre distribution Linux."
-
#. type: Bullet: '1. '
msgid ""
"Start <span class=\"application\">GNOME Disks</span> (also called <span "
@@ -95,12 +25,24 @@ msgstr ""
"class=\"application\">Disques</span>)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " For example, you can choose <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disks</span></span>.\n"
msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
msgstr ""
" Par exemple, vous pouvez cliquer sur <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
@@ -112,13 +54,12 @@ msgstr ""
msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
+#, fuzzy
+#| msgid "Plug the first USB stick in the computer."
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
msgstr "Branchez la première clé USB dans l'ordinateur."
#. type: Plain text
@@ -131,11 +72,6 @@ msgstr " Un nouveau disque apparaît dans la panneau de gauche. Cliquez dessus
msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
msgid ""
"Click on the [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link="
@@ -152,160 +88,45 @@ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"
msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "If you are using the GNOME desktop environment, <span class=\"application\">GNOME Disks</span> should be installed by default."
msgid ""
" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" Si votre version de <span class=\"application\">GNOME Disques</span> est\n"
-" ancienne elle peut avoir à la place le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]].\n"
-" Cliquez sur le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]]\n"
-" et choisissez <span class=\"guimenuitem\">Restaurer l'image\n"
-" disque&hellip;</span>.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
+" old it might have a\n"
+msgstr "Si vous utilisez l'environnement de bureau GNOME, <span class=\"application\">GNOME Disks</span> devrait être installé par défaut."
#. type: Plain text
#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+msgid " [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
msgstr ""
-" <p>Si votre version de <span class=\"application\">GNOME Disques</span> est encore plus ancienne\n"
-" et n'a ni un bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" ni un bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]],\n"
-" vous devez [[!toggle id=\"dd\" text=\"installer un Tails intermédiaire\n"
-" en utilisant la ligne de commande\"]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Installer un Tails intermédiaire en ligne de commande\n"
-" ----------------------------------------------------\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
+msgid " button instead. Click on the\n"
msgstr ""
-"Notez le *nom du périphérique* de la première clé USB affichée dans le "
-"panneau de droite. Le nom du périphérique devrait être quelque chose comme `/"
-"dev/sdb`, `/dev/sdc`, etc."
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| 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>."
msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Si vous n'êtes pas sûr du nom du périphérique, vous devriez arrêter car vous\n"
-" risqueriez d'écraser les données de n'importe quel disque dur de l'ordinateur.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Ouvrez un terminal."
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Exécutez la commande suivante, en remplaçant `[tails.iso]`par le chemin de "
-"l'image iso que vous voulez installer et `[device]` par le nom du "
-"périphérique trouvé à l'étape 1."
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
+msgstr "Cliquez sur le bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] dans la barre de titre puis sur <span class=\"guimenuitem\">Restaurer l'image disque&hellip;</span>."
#. type: Plain text
#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Voici un exemple de commande à exécuter, la votre sera sûrement différente :\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Si vous n'êtes pas sûr de l'emplacement de l'image ISO ou si vous obtenez un message d'erreur <span\n"
-" class=\"guilabel\">Aucun fichier ou dossier de ce type</span>, vous pouvez d'abord\n"
-" taper <code>dd</code>, suivit par un espace, puis glisser et déposer\n"
-" l'icône de l'image ISO d'un navigateur de fichier vers le terminal. Cela devrait\n"
-" insérer le chemin de l'image ISO dans le terminal. Puis complétez la\n"
-" commande et exécutez la.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Si aucun message d'erreur n’apparaît, Tails est en cours d'installation sur "
-"la clé USB. Cela dure quelques minutes."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Vous pouvez maintenant passer à l'étape suivante et [[Ouvrir ces instructions sur un\n"
-" autre périphérique|usb#intermediary]].\n"
+msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#| "on the file selector button and choose the ISO image that you downloaded "
+#| "earlier."
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
+"the file selector button and choose the USB disk image that you downloaded "
"earlier."
msgstr ""
"Dans la boite de dialogue <span class=\"guimenuitem\">Restaurer l'image "
@@ -320,8 +141,12 @@ msgstr ""
"</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#| "The installation takes a few minutes."
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
"installation takes a few minutes."
msgstr ""
"Dans la fenêtre de confirmation, cliquez sur <span class=\"button"
@@ -335,30 +160,181 @@ msgstr ""
"Une fois l'installation terminée, cliquez sur le bouton [[!img lib/media-"
"eject.png alt=\"Éjecter\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta title=\"Install from Linux\"]]\n"
+#~ msgstr "[[!meta title=\"Installer depuis Linux\"]]\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 "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta robots=\"noindex\"]]\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.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "<div class=\"hidden-step-1\"></div>\n"
+#~ msgstr "<div class=\"hidden-step-1\"></div>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "<p class=\"start\">Start in Linux.</p>\n"
+#~ msgstr "<p class=\"start\">Démarrez Linux.</p>\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Install <span class=\"application\">GNOME Disks</span>."
+#~ msgstr "Installez <span class=\"application\">GNOME Disks</span>."
+
+#~ msgid ""
+#~ "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#~ "package using the usual installation method for your Linux distribution."
+#~ msgstr ""
+#~ "Sinon, installez le paquet <span class=\"code\">gnome-disk-utility</span> "
+#~ "en utilisant la méthode habituelle d'installation de votre distribution "
+#~ "Linux."
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " Si votre version de <span class=\"application\">GNOME Disques</span> est\n"
+#~ " ancienne elle peut avoir à la place le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]].\n"
+#~ " Cliquez sur le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " et choisissez <span class=\"guimenuitem\">Restaurer l'image\n"
+#~ " disque&hellip;</span>.\n"
+
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
+
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Si votre version de <span class=\"application\">GNOME Disques</span> est encore plus ancienne\n"
+#~ " et n'a ni un bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " ni un bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " vous devez [[!toggle id=\"dd\" text=\"installer un Tails intermédiaire\n"
+#~ " en utilisant la ligne de commande\"]].</p>\n"
+
+#~ msgid " </div>\n"
+#~ msgstr " </div>\n"
+
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Installer un Tails intermédiaire en ligne de commande\n"
+#~ " ----------------------------------------------------\n"
+
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Notez le *nom du périphérique* de la première clé USB affichée dans le "
+#~ "panneau de droite. Le nom du périphérique devrait être quelque chose "
+#~ "comme `/dev/sdb`, `/dev/sdc`, etc."
+
+#~ msgid " <div class=\"caution\">\n"
+#~ msgstr " <div class=\"caution\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Si vous n'êtes pas sûr du nom du périphérique, vous devriez arrêter car vous\n"
+#~ " risqueriez d'écraser les données de n'importe quel disque dur de l'ordinateur.</p>\n"
+
+#~ msgid "Open a terminal."
+#~ msgstr "Ouvrez un terminal."
+
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Exécutez la commande suivante, en remplaçant `[tails.iso]`par le chemin "
+#~ "de l'image iso que vous voulez installer et `[device]` par le nom du "
+#~ "périphérique trouvé à l'étape 1."
+
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Voici un exemple de commande à exécuter, la votre sera sûrement différente :\n"
+
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Si vous n'êtes pas sûr de l'emplacement de l'image ISO ou si vous obtenez un message d'erreur <span\n"
+#~ " class=\"guilabel\">Aucun fichier ou dossier de ce type</span>, vous pouvez d'abord\n"
+#~ " taper <code>dd</code>, suivit par un espace, puis glisser et déposer\n"
+#~ " l'icône de l'image ISO d'un navigateur de fichier vers le terminal. Cela devrait\n"
+#~ " insérer le chemin de l'image ISO dans le terminal. Puis complétez la\n"
+#~ " commande et exécutez la.</p>\n"
+
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Si aucun message d'erreur n’apparaît, Tails est en cours d'installation "
+#~ "sur la clé USB. Cela dure quelques minutes."
+
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Vous pouvez maintenant passer à l'étape suivante et [[Ouvrir ces instructions sur un\n"
+#~ " autre périphérique|usb#intermediary]].\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.fr\" raw=\"yes\" sort=\"age\"]]\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"
+
+#~ 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/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
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 8840c11..c0d1885 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
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-07-17 15:57+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -16,78 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Install from Linux\"]]\n"
-msgstr "[[!meta title=\"Installa da Linux\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
-msgid "[[!meta robots=\"noindex\"]]\n"
-msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
-msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"hidden-step-1\"></div>\n"
-msgstr "<div class=\"hidden-step-1\"></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p class=\"start\">Start in Linux.</p>\n"
-msgstr "<p class=\"start\">Avviare in Linux.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr "Installa <span class=\"application\">GNOME Disks</span>."
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-"Se stai usando l'ambiente desktop GNOME, <span class=\"application\">GNOME "
-"Disks</span> dovrebbe essere installato di default."
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-"Altrimenti, installa il pacchetto <span class=\"code\">gnome-disk-utility</"
-"span> usando i metodi di installazione usuali per la tua distribuzione Linux."
-
#. type: Bullet: '1. '
msgid ""
"Start <span class=\"application\">GNOME Disks</span> (also called <span "
@@ -97,12 +25,24 @@ msgstr ""
"class=\"application\">Disks</span>)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " For example, you can choose <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disks</span></span>.\n"
msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
msgstr ""
" Per esempio, puoi scegliere <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
@@ -114,13 +54,12 @@ msgstr ""
msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
+#, fuzzy
+#| msgid "Plug the first USB stick in the computer."
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
msgstr "Collega la prima chiave USB al computer."
#. type: Plain text
@@ -133,11 +72,6 @@ msgstr " Un nuovo dispositivo apparirà nel pannello di sinistra. Cliccaci sop
msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
@@ -161,167 +95,44 @@ msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
+#| msgid "If you are using the GNOME desktop environment, <span class=\"application\">GNOME Disks</span> should be installed by default."
msgid ""
" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
-" e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
-" devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
-" usando la riga di comando\"]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+" old it might have a\n"
+msgstr "Se stai usando l'ambiente desktop GNOME, <span class=\"application\">GNOME Disks</span> dovrebbe essere installato di default."
#. type: Plain text
#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+msgid " [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
msgstr ""
-" <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
-" e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
-" devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
-" usando la riga di comando\"]].</p>\n"
#. type: Plain text
#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Installa una Tails intermediaria usando la riga di comando\n"
-" ----------------------------------------------------\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
+msgid " button instead. Click on the\n"
msgstr ""
-"Prendi nota del *nome del dispositivo* della prima chiave USB come mostrato "
-"nel pannello di sinistra. Il nome del dispostivo dovrebbe essere qualcosa "
-"come `/dev/sdb`, `/dev/sdc`, etc."
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Se non sei sicura del nome del dispositivo, dovresti fermarti oppure\n"
-" rischi di sovrascrivere un qualche hard disk del computer.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Apri un terminale."
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Esegui il seguente comando, sostituendo '[tails.iso]' con il percorso "
-"all'immagine ISO che vuoi installare e '[device]' con il nome del "
-"dispositivo trovato nel primo passaggio."
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Qui c'è un esempio del comando da eseguire, il tuo sarà probabilmente differente:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Se non sei sicura del percorso dell'immagine ISOo se ricevi un messaggio\n"
-" d'errore <span class=\"guilabel\">No such file or directory</span>, puoi prima\n"
-" digitare <code>dd</code>, seguito da uno spazio, e poi trascinare e lasciare\n"
-" l'incona dell'immagine ISO da un file browser dentro il terminale. Fare questo \n"
-" dovrebbe inserire il percorso corretto dell'immagine ISO nel terminale. Poi completa\n"
-" il comando ed eseguilo.</p>\n"
-
-#. type: Bullet: ' 1. '
+#, fuzzy, no-wrap
+#| msgid "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] button in the titlebar and choose <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Se non ritorna un messaggio di errore, Tails è in fase di installazione "
-"sulla chiave USB. L'installazione richiede alcuni minuti."
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
+msgstr "Clicca sul pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nella barra del titolo e scegli <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>."
#. type: Plain text
#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Puoi continuare con i prossimi passi e [[Aprire queste istruzioni su un\n"
-" altro dispositivo| usb#intermediary]].\n"
+msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#| "on the file selector button and choose the ISO image that you downloaded "
+#| "earlier."
msgid ""
"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
+"the file selector button and choose the USB disk image that you downloaded "
"earlier."
msgstr ""
"Nella finestra di dialogo <span class=\"guilabel\">Restore Disk Image</"
@@ -335,8 +146,12 @@ msgstr ""
"Clicca sul pulsante <span class=\"button\">Start Restoring&hellip;</span>."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#| "The installation takes a few minutes."
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
"installation takes a few minutes."
msgstr ""
"Nella finestra di conferma, clicca <span class=\"button\">Restore</span>. "
@@ -350,30 +165,195 @@ msgstr ""
"Una volta che l'installazione è completata, clicca sul pulsante [[!img lib/"
"media-eject.png alt=\"Eject\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta title=\"Install from Linux\"]]\n"
+#~ msgstr "[[!meta title=\"Installa da Linux\"]]\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\" raw=\"yes\" sort=\"age\"]]\n"
+#, fuzzy
+#~| msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\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\" raw=\"yes\" sort=\"age\"]]\n"
+#, fuzzy
+#~| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+#~ msgstr "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]]\n"
+
+#~ msgid "<div class=\"hidden-step-1\"></div>\n"
+#~ msgstr "<div class=\"hidden-step-1\"></div>\n"
+
+#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid "<p class=\"start\">Start in Linux.</p>\n"
+#~ msgstr "<p class=\"start\">Avviare in Linux.</p>\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "Install <span class=\"application\">GNOME Disks</span>."
+#~ msgstr "Installa <span class=\"application\">GNOME Disks</span>."
+
+#~ msgid ""
+#~ "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#~ "package using the usual installation method for your Linux distribution."
+#~ msgstr ""
+#~ "Altrimenti, installa il pacchetto <span class=\"code\">gnome-disk-"
+#~ "utility</span> usando i metodi di installazione usuali per la tua "
+#~ "distribuzione Linux."
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
+#~ " e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
+#~ " usando la riga di comando\"]].</p>\n"
+
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
+#~ " e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
+#~ " usando la riga di comando\"]].</p>\n"
+
+#~ msgid " </div>\n"
+#~ msgstr " </div>\n"
+
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Installa una Tails intermediaria usando la riga di comando\n"
+#~ " ----------------------------------------------------\n"
+
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Prendi nota del *nome del dispositivo* della prima chiave USB come "
+#~ "mostrato nel pannello di sinistra. Il nome del dispostivo dovrebbe essere "
+#~ "qualcosa come `/dev/sdb`, `/dev/sdc`, etc."
+
+#~ msgid " <div class=\"caution\">\n"
+#~ msgstr " <div class=\"caution\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Se non sei sicura del nome del dispositivo, dovresti fermarti oppure\n"
+#~ " rischi di sovrascrivere un qualche hard disk del computer.</p>\n"
+
+#~ msgid "Open a terminal."
+#~ msgstr "Apri un terminale."
+
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Esegui il seguente comando, sostituendo '[tails.iso]' con il percorso "
+#~ "all'immagine ISO che vuoi installare e '[device]' con il nome del "
+#~ "dispositivo trovato nel primo passaggio."
+
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Qui c'è un esempio del comando da eseguire, il tuo sarà probabilmente differente:\n"
+
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
+
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Se non sei sicura del percorso dell'immagine ISOo se ricevi un messaggio\n"
+#~ " d'errore <span class=\"guilabel\">No such file or directory</span>, puoi prima\n"
+#~ " digitare <code>dd</code>, seguito da uno spazio, e poi trascinare e lasciare\n"
+#~ " l'incona dell'immagine ISO da un file browser dentro il terminale. Fare questo \n"
+#~ " dovrebbe inserire il percorso corretto dell'immagine ISO nel terminale. Poi completa\n"
+#~ " il comando ed eseguilo.</p>\n"
+
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Se non ritorna un messaggio di errore, Tails è in fase di installazione "
+#~ "sulla chiave USB. L'installazione richiede alcuni minuti."
+
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Puoi continuare con i prossimi passi e [[Aprire queste istruzioni su un\n"
+#~ " altro dispositivo| usb#intermediary]].\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\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\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
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
new file mode 100644
index 0000000..7e547b6
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po
@@ -0,0 +1,133 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Start <span class=\"application\">GNOME Disks</span> (also called <span "
+"class=\"application\">Disks</span>)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"linux\">\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"
+" <div class=\"upgrade\">\n"
+" Choose <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Disks</span></span>.\n"
+" </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Plug the <span class=\"upgrade\">intermediary</span> USB stick in the "
+"computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " A new drive appears in the left pane. Click on it.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" "
+"alt=\"\"]]\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>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" "
+"alt=\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If your version of <span class=\"application\">GNOME Disks</span> is\n"
+" old it might have a\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" "
+"link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " button instead. Click on the\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" button and choose\n"
+" <span class=\"guimenuitem\">Restore Disk Image&hellip;</span>.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" "
+"alt=\"\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
+"the file selector button and choose the USB disk image that you downloaded "
+"earlier."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
+"installation takes a few minutes."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"After the installation is finished, click on the [[!img lib/media-eject.png "
+"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+msgstr ""
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 19b5b1a..2fbf014 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.de.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-02-09 20:59+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -61,11 +61,6 @@ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\"]]\n"
@@ -101,14 +96,24 @@ msgstr ""
"Die URL dieser Seite aufzuschreiben, damit Sie später wiederkommen können:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| " <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| " <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| " <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| " <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
+#| " <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| " <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| " <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| " <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| " <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
msgid ""
" <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -126,12 +131,17 @@ msgstr ""
" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/index.de.html#back`</span>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Starten Sie mit dem vorübergehenden Tails neu</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Starten Sie mit dem anderen Tails neu</h1>\n"
@@ -152,13 +162,13 @@ 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-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"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
-msgid "[[!img install/inc/infography/restart-on-intermediary-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-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
#. type: Plain text
@@ -184,13 +194,21 @@ msgid "<div class=\"note clone\">\n"
msgstr "<div class=\"note clone\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -202,15 +220,26 @@ msgstr ""
"<span class=\"upgrade\">aktualisieren</span>.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| " <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+#| " <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| " </p>\n"
+#| " <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+#| " <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| " <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| " <span class=\"upgrade\">upgrade</span>\n"
+#| " from.</p>\n"
+#| " <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -316,10 +345,10 @@ msgstr ""
#| " about Tails not starting at all\"]].</p>\n"
#| " </div>\n"
msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -652,8 +681,9 @@ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails des
msgstr " [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr "<div class=\"trophy windows linux mac\">\n"
#. type: Plain text
@@ -688,6 +718,9 @@ msgstr ""
"<p class=\"clone mac-dvd\">Dies war ein erster, aber wichtiger Schritt!\n"
"Holen Sie nun Ihren <span class=\"clone\">neuen</span> USB-Stick, auf dem Sie Tails installieren wollen.</p>\n"
+#~ msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\"]]\n"
+
#, fuzzy
#~| msgid ""
#~| "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
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 a802a3c..2014b87 100755
--- a/wiki/src/install/inc/steps/restart_first_time.inline.es.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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/"
@@ -63,11 +63,6 @@ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -103,14 +98,24 @@ msgstr ""
"Tomes nota de la dirección URL de esta página para poder volver a ella luego:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| " <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| " <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| " <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| " <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
+#| " <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| " <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| " <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| " <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| " <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
msgid ""
" <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -128,12 +133,17 @@ msgstr ""
" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Reinicia en el Tails intermediario</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Reinicia en otro Tails</h1>\n"
@@ -151,13 +161,15 @@ msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clo
msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"Memoria USB conectada en la izquierda\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computadora reiniciada en la memoria USB en la derecha\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-intermediary-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-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computadora reiniciada en la memoria USB en la izquierda\"]]\n"
#. type: Plain text
@@ -181,13 +193,21 @@ msgid "<div class=\"note clone\">\n"
msgstr "<div class=\"note clone\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -200,15 +220,26 @@ msgstr ""
"desde un DVD de Tails de un modo similar.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| " <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+#| " <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| " </p>\n"
+#| " <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+#| " <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| " <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| " <span class=\"upgrade\">upgrade</span>\n"
+#| " from.</p>\n"
+#| " <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -267,9 +298,7 @@ msgstr " <div class=\"mac-usb mac-clone\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-" [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\""
-" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"install/inc/steps/mac_startup_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -288,8 +317,7 @@ msgstr ""
" <div class=\"bug mac\">\n"
" <p>Si solo aparece tu disco duro Macintosh, puedes intentar\n"
" reinstalando un Tails intermedio desde [[Windows usando\n"
-" <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>"
-"\n"
+" <span class=\"application\">Universal USB Installer</span>|win/usb]].</p>\n"
" </div>\n"
#. type: Bullet: '1. '
@@ -302,12 +330,23 @@ msgstr ""
"segundos.</p>"
#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"note install-clone debian expert windows linux\">\n"
+#| " <p>Most computers do not start on Tails by default. If it does you\n"
+#| " are lucky. Otherwise, if the computer starts on\n"
+#| " <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+#| " <span class=\"windows\">Windows,</span>\n"
+#| " <span class=\"linux\">Linux,</span>\n"
+#| " <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| " refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| " about Tails not starting at all\"]].</p>\n"
+#| " </div>\n"
+msgid ""
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -408,8 +447,8 @@ msgid ""
"After 30&ndash;60 seconds, another screen called <span class=\"application"
"\">Tails Greeter</span> appears."
msgstr ""
-"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class=\""
-"application\">Tails Greeter</span>."
+"Después de 30&ndash;60 segundos aparece otra pantalla llamada <span class="
+"\"application\">Tails Greeter</span>."
#. type: Plain text
#, no-wrap
@@ -423,8 +462,7 @@ msgstr ""
" <div class=\"note\">\n"
" <p>Si la computadora muestra el mensaje de error\n"
" <span class=\"guilabel\">Error iniciando GDM con tu tarjeta\n"
-" gráfica</span>, revisa nuestra [[lista de problemas conocidos con "
-"tarjetas\n"
+" gráfica</span>, revisa nuestra [[lista de problemas conocidos con tarjetas\n"
" gráficas|support/known_issues/graphics]].</p>\n"
#. type: Plain text
@@ -520,9 +558,9 @@ msgid ""
"\">Probing EDD (edd=off to disable)...</span> error, then type `edd=off` to "
"add this option to the command line."
msgstr ""
-"Si Tails falló previamente al iniciar y mostró el error <span class=\"code\">"
-"Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para agregar "
-"esta opción a la línea de comandos."
+"Si Tails falló previamente al iniciar y mostró el error <span class=\"code"
+"\">Probing EDD (edd=off to disable)...</span>, escribe `edd=off` para "
+"agregar esta opción a la línea de comandos."
#. type: Bullet: ' 1. '
msgid "Type `debug nosplash` to add these options to the command line."
@@ -613,8 +651,9 @@ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails des
msgstr " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"EscritorioTails\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr "<div class=\"trophy windows linux mac\">\n"
#. type: Plain text
@@ -646,6 +685,9 @@ msgstr ""
"<p class=\"clone mac-dvd\">¡ Este ha sido un paso importante !\n"
"<span class=\"mac-dvd\">Ahora toma la nueva memoria USB sobre la cual quieres instalar Tails.</span></p>\n"
+#~ msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+
#~ msgid ""
#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
#~ "\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
index 93c132b..a681600 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -59,11 +59,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr ""
@@ -103,7 +98,6 @@ msgid ""
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -113,10 +107,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
#. type: Plain text
@@ -131,12 +125,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-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-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
msgstr ""
#. type: Plain text
@@ -163,10 +157,10 @@ msgstr ""
#, no-wrap
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -176,11 +170,11 @@ msgstr ""
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -250,10 +244,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -487,7 +481,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr ""
#. type: Plain text
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 006bcbe..fea366d 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-20 11:28+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -61,11 +61,6 @@ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class=\
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
@@ -100,14 +95,24 @@ msgid "Take note of the URL of this page to be able to come back later:"
msgstr "Noter l'adresse de cette page pour pouvoir y revenir plus tard :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
+#| " <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
+#| " <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
+#| " <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
+#| " <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
+#| " <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
+#| " <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
+#| " <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
+#| " <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
+#| " <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
msgid ""
" <span class=\"install-clone\">`https://tails.boum.org/install/clone/#back`</span>\n"
" <span class=\"windows\">`https://tails.boum.org/install/win/usb/#back`</span>\n"
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -125,12 +130,17 @@ msgstr ""
" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/index.fr.html#back`</span>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Redémarrer sur le Tails intermédiaire</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Redémarrer sur l'autre Tails</h1>\n"
@@ -148,13 +158,15 @@ msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clo
msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Ordinateur redémarrant avec la clé USB sur la droite\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-intermediary-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-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Ordinateur redémarrant avec la clé USB sur la gauche\"]]\n"
#. type: Plain text
@@ -178,13 +190,21 @@ msgid "<div class=\"note clone\">\n"
msgstr "<div class=\"note clone\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -197,15 +217,26 @@ msgstr ""
"depuis un DVD Tails de façon similaire.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| " <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+#| " <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| " </p>\n"
+#| " <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+#| " <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| " <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| " <span class=\"upgrade\">upgrade</span>\n"
+#| " from.</p>\n"
+#| " <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -296,12 +327,23 @@ msgstr ""
"secondes.</p>"
#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"note install-clone debian expert windows linux\">\n"
+#| " <p>Most computers do not start on Tails by default. If it does you\n"
+#| " are lucky. Otherwise, if the computer starts on\n"
+#| " <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+#| " <span class=\"windows\">Windows,</span>\n"
+#| " <span class=\"linux\">Linux,</span>\n"
+#| " <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| " refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| " about Tails not starting at all\"]].</p>\n"
+#| " </div>\n"
+msgid ""
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -613,8 +655,9 @@ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails des
msgstr " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Bureau Tails\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr "<div class=\"trophy windows linux mac\">\n"
#. type: Plain text
@@ -645,3 +688,6 @@ msgid ""
msgstr ""
"<p class=\"clone mac-dvd\">C'était une première étape importante !\n"
"<span class=\"mac-dvd\">Maintenant attrapez la clé USB sur laquelle vous voulez installer Tails.</span></p>\n"
+
+#~ msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
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 4a74cbb..7b81ff6 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"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -62,11 +62,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr ""
@@ -119,7 +114,6 @@ msgid ""
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -137,12 +131,17 @@ msgstr ""
" <span class=\"upgrade-tails\">`https://tails.boum.org/upgrade/tails/#back`</span>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+#| "<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
+#| "<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
+#| "<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Riavvia sulla Tails intermediaria</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Riavvia su un'altra Tails</h1>\n"
@@ -161,14 +160,16 @@ msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clo
msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
+msgstr "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no\" class=\"clone windows linux mac-usb\"]]\n"
#. type: Plain text
#, no-wrap
@@ -191,13 +192,21 @@ msgid "<div class=\"note clone\">\n"
msgstr "<div class=\"note clone\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>The following instructions assume that the other Tails that you are\n"
+#| "<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+#| "<span class=\"upgrade\">upgrading</span>\n"
+#| "from is on a USB stick. You can also\n"
+#| "<span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| "<span class=\"upgrade\">upgrade</span>\n"
+#| "from a Tails DVD in a similar way.</p>\n"
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -210,15 +219,26 @@ msgstr ""
"da un DVD Tails in modo simile.</p>\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. <p>\n"
+#| " <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
+#| " <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+#| " </p>\n"
+#| " <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
+#| " <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
+#| " <span class=\"install-clone debian windows linux mac\">install</span>\n"
+#| " <span class=\"upgrade\">upgrade</span>\n"
+#| " from.</p>\n"
+#| " <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -311,12 +331,23 @@ msgstr ""
"<span class=\"keycap\">Invio</span>"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"note install-clone debian expert windows linux\">\n"
+#| " <p>Most computers do not start on Tails by default. If it does you\n"
+#| " are lucky. Otherwise, if the computer starts on\n"
+#| " <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
+#| " <span class=\"windows\">Windows,</span>\n"
+#| " <span class=\"linux\">Linux,</span>\n"
+#| " <span class=\"install-clone\">Windows or Linux,</span>\n"
+#| " refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting section\n"
+#| " about Tails not starting at all\"]].</p>\n"
+#| " </div>\n"
msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -324,6 +355,16 @@ msgid ""
" about Tails not starting at all\"]].</p>\n"
" </div>\n"
msgstr ""
+" <div class=\"note install-clone debian expert windows linux\">\n"
+" <p>La maggior parte dei computer non si avvia su Tails di default. Se succede\n"
+" sei fortunata. Altrimenti, se il computer si avvia su\n"
+" <span class=\"debian expert\">Debian o Ubuntu,</span>\n"
+" <span class=\"windows\">Windows,</span>\n"
+" <span class=\"linux\">Linux,</span>\n"
+" <span class=\"install-clone\">Windows o Linux,</span>\n"
+" fai riferimento [[!toggle id=\"not_at_all\" text=\"alla sezione sulla risoluzioni di problemi \n"
+" per quando Tails non si avvia per niente\"]].</p>\n"
+" </div>\n"
#. type: Plain text
#, no-wrap
@@ -633,8 +674,9 @@ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails des
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr "<div class=\"trophy windows linux mac\">\n"
#. type: Plain text
@@ -754,20 +796,6 @@ msgstr ""
#~ "\"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-intermediary-tails.png link=\"no"
-#~ "\" class=\"clone windows linux mac-usb\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/restart-on-intermediary-tails.png link=\"no"
-#~ "\" class=\"clone windows linux mac-usb\"]]\n"
-
-#~ msgid ""
#~ "[[!img install/inc/infography/restart-on-dvd.png link=\"no\" class=\"mac-"
#~ "dvd\"]]\n"
#~ msgstr ""
@@ -782,37 +810,11 @@ msgstr ""
#~ "class=\"upgrade-tails\"]]\n"
#~ msgid ""
-#~ " [[!img install/inc/screenshots/mac_option_key.png class=\""
-#~ "mac-dvd\" link=\"no\"]]\n"
-#~ msgstr ""
-#~ " [[!img install/inc/screenshots/mac_option_key.png class=\""
-#~ "mac-dvd\" link=\"no\"]]\n"
-
-#~ msgid ""
-#~ " <div class=\"note install-clone debian expert windows linux\">\n"
-#~ " <p>Most computers do not start on Tails by default. If it does you\n"
-#~ " are lucky. Otherwise, if the computer starts on\n"
-#~ " <span class=\"debian expert\">Debian or Ubuntu,</span>\n"
-#~ " <span class=\"windows\">Windows,</span>\n"
-#~ " <span class=\"linux\">Linux,</span>\n"
-#~ " <span class=\"install-clone\">Windows or Linux,</span>\n"
-#~ " refer to [[!toggle id=\"not_at_all\" text=\"the troubleshooting "
-#~ "section\n"
-#~ " about Tails not starting at all\"]].</p>\n"
-#~ " </div>\n"
+#~ " [[!img install/inc/screenshots/mac_option_key.png class=\"mac-dvd\" "
+#~ "link=\"no\"]]\n"
#~ msgstr ""
-#~ " <div class=\"note install-clone debian expert windows linux\">\n"
-#~ " <p>La maggior parte dei computer non si avvia su Tails di default. Se "
-#~ "succede\n"
-#~ " sei fortunata. Altrimenti, se il computer si avvia su\n"
-#~ " <span class=\"debian expert\">Debian o Ubuntu,</span>\n"
-#~ " <span class=\"windows\">Windows,</span>\n"
-#~ " <span class=\"linux\">Linux,</span>\n"
-#~ " <span class=\"install-clone\">Windows o Linux,</span>\n"
-#~ " fai riferimento [[!toggle id=\"not_at_all\" text=\"alla sezione sulla "
-#~ "risoluzioni di problemi \n"
-#~ " per quando Tails non si avvia per niente\"]].</p>\n"
-#~ " </div>\n"
+#~ " [[!img install/inc/screenshots/mac_option_key.png class=\"mac-dvd\" "
+#~ "link=\"no\"]]\n"
#~ msgid ""
#~ " [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
@@ -821,9 +823,5 @@ msgstr ""
#~ " [[!img doc/first_steps/startup_options/boot-menu-with-options.png "
#~ "link=\"no\"]]\n"
-#~ msgid ""
-#~ " [[!img install/inc/screenshots/desktop.png link="
-#~ "\"no\"]]\n"
-#~ msgstr ""
-#~ " [[!img install/inc/screenshots/desktop.png link="
-#~ "\"no\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/desktop.png link=\"no\"]]\n"
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
index 30bc5a3..6463cea 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-20 17:47+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -60,11 +60,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class=\"debian qrcode\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid " [[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class=\"expert qrcode\" link=\"no\" alt=\"\"]]\n"
msgstr ""
@@ -104,7 +99,6 @@ msgid ""
" <span class=\"mac-usb\">`https://tails.boum.org/install/mac/usb/#back`</span>\n"
" <span class=\"mac-clone\">`https://tails.boum.org/install/mac/clone/#back`</span>\n"
" <span class=\"mac-dvd\">`https://tails.boum.org/install/mac/dvd/#back`</span>\n"
-" <span class=\"debian\">`https://tails.boum.org/install/debian/usb/#back`</span>\n"
" <span class=\"expert\">`https://tails.boum.org/install/expert/usb/#back`</span>\n"
" <span class=\"linux\">`https://tails.boum.org/install/linux/usb/#back`</span>\n"
" <span class=\"upgrade-clone\">`https://tails.boum.org/upgrade/clone/#back`</span>\n"
@@ -114,10 +108,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<h1 id=\"start-intermediary\" class=\"windows linux mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
+"<h1 id=\"start-intermediary\" class=\"windows mac-usb upgrade-tails\">Restart on the intermediary Tails</h1>\n"
"<h1 id=\"start-other\" class=\"clone\">Restart on the other Tails</h1>\n"
"<h1 id=\"start-dvd\" class=\"mac-dvd\">Restart on the Tails DVD</h1>\n"
-"<h1 id=\"start-tails\" class=\"debian expert\">Restart on Tails</h1>\n"
+"<h1 id=\"start-tails\" class=\"linux expert\">Restart on Tails</h1>\n"
msgstr ""
#. type: Plain text
@@ -132,12 +126,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"debian\" alt=\"Computer restarted on USB stick on the right\"]]\n"
+msgid "[[!img install/inc/infography/restart-on-tails.png link=\"no\" class=\"linux\" alt=\"Computer restarted on USB stick on the right\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/restart-on-intermediary-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-intermediary-tails.png link=\"no\" class=\"clone windows mac-usb\" alt=\"Computer restarted on USB stick on the left\"]]\n"
msgstr ""
#. type: Plain text
@@ -164,10 +158,10 @@ msgstr ""
#, no-wrap
msgid ""
"<p>The following instructions assume that the other Tails that you are\n"
-"<span class=\"install-clone debian windows linux mac\">installing</span>\n"
+"<span class=\"install-clone windows linux mac\">installing</span>\n"
"<span class=\"upgrade\">upgrading</span>\n"
"from is on a USB stick. You can also\n"
-"<span class=\"install-clone debian windows linux mac\">install</span>\n"
+"<span class=\"install-clone windows linux mac\">install</span>\n"
"<span class=\"upgrade\">upgrade</span>\n"
"from a Tails DVD in a similar way.</p>\n"
msgstr ""
@@ -177,11 +171,11 @@ msgstr ""
msgid ""
"1. <p>\n"
" <span class=\"mac-dvd\">Make sure that the DVD is inserted in the computer.</span>\n"
-" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows linux mac\">first</span> USB stick plugged in.</span>\n"
+" <span class=\"usb\">Shut down the computer while leaving the <span class=\"windows mac\">first</span> USB stick plugged in.</span>\n"
" </p>\n"
" <p class=\"mac-dvd clone upgrade-tails\">Shut down the computer.</p>\n"
" <p class=\"clone\">Plug in the other Tails USB stick that you want to\n"
-" <span class=\"install-clone debian windows linux mac\">install</span>\n"
+" <span class=\"install-clone windows linux mac\">install</span>\n"
" <span class=\"upgrade\">upgrade</span>\n"
" from.</p>\n"
" <p class=\"upgrade-tails\">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>\n"
@@ -251,10 +245,10 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <div class=\"note install-clone debian expert windows linux\">\n"
+" <div class=\"note install-clone expert windows linux\">\n"
" <p>Most computers do not start on Tails by default. If it does you\n"
" are lucky. Otherwise, if the computer starts on\n"
-" <span class=\"debian expert\">Debian, Ubuntu, or Linux Mint</span>\n"
+" <span class=\"expert\">Debian, Ubuntu, or Linux Mint</span>\n"
" <span class=\"windows\">Windows,</span>\n"
" <span class=\"linux\">Linux,</span>\n"
" <span class=\"install-clone\">Windows or Linux,</span>\n"
@@ -487,8 +481,9 @@ msgid " [[!img install/inc/screenshots/desktop.png link=\"no\" alt=\"Tails des
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<div class=\"trophy windows linux mac\">\n"
+#, fuzzy, no-wrap
+#| msgid "<div class=\"trophy windows linux mac\">\n"
+msgid "<div class=\"trophy windows mac\">\n"
msgstr "<div class=\"trophy windows linux mac\">\n"
#. type: Plain text
diff --git a/wiki/src/install/linux/usb.de.po b/wiki/src/install/linux/usb.de.po
index 1625538..bf4c796 100644
--- a/wiki/src/install/linux/usb.de.po
+++ b/wiki/src/install/linux/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-08-22 18:18+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -63,10 +63,35 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png lin
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr "<p class=\"start\">Starten Sie unter Linux.</p>\n"
+#. type: Title =
+#, no-wrap
+msgid "Install Tails\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Install <span class=\"application\">GNOME Disks</span>."
+msgid ""
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
+msgstr "Installieren Sie <span class=\"application\">GNOME Disks</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " <div class=\"caution\">\n"
+msgid "<div class=\"caution\">\n"
+msgstr " <div class=\"caution\">\n"
+
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " </div>\n"
+msgid "</div>\n"
+msgstr " </div>\n"
#. type: Bullet: '1. '
msgid "Install <span class=\"application\">GNOME Disks</span>."
@@ -81,303 +106,253 @@ msgstr ""
"\">GNOME Disks</span> standardmäßig installiert sein."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#| "package using the usual installation method for your Linux distribution."
msgid ""
"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
+"package using the usual installation method for your distribution."
msgstr ""
"Installieren Sie ansonsten das Paket <span class=\"code\">gnome-disk-"
"utility</span> unter Nutzung der gewohnten Installationsweise für Ihre Linux-"
"Distribution."
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-"Starten Sie <span class=\"application\">GNOME Disks</span> (auch <span class="
-"\"application\">Laufwerke</span> genannt)."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/install_final.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/install_final.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-" Zum Beispiel können Sie <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Hilfsprogramme</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Laufwerke</span></span> auswählen.\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.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+msgid "XXX Step incorrectly numbered"
+msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr "Schließen Sie den ersten USB-Stick an den Computer an."
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr " Ein neues Laufwerk erscheint im linken Fensterbereich. Klicken Sie darauf.\n"
+#~ msgid ""
+#~ "Start <span class=\"application\">GNOME Disks</span> (also called <span "
+#~ "class=\"application\">Disks</span>)."
+#~ msgstr ""
+#~ "Starten Sie <span class=\"application\">GNOME Disks</span> (auch <span "
+#~ "class=\"application\">Laufwerke</span> genannt)."
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid ""
+#~ " For example, you can choose <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disks</span></span>.\n"
+#~ msgstr ""
+#~ " Zum Beispiel können Sie <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Hilfsprogramme</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Laufwerke</span></span> auswählen.\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic"
-#| "\" link=\"no\"]] button in the titlebar and choose <span class="
-#| "\"guimenuitem\">Restore Disk Image&hellip;</span>."
-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>."
-msgstr ""
-"Klicken Sie in der Titelleiste des Fensters auf die Schaltfläche [[!img lib/"
-"emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] und wählen "
-"Sie <span class=\"guimenuitem\">Laufwerksabbild wiederherstellen&hellip;</"
-"span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid "Plug the first USB stick in the computer."
+#~ msgstr "Schließen Sie den ersten USB-Stick an den Computer an."
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
-" Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
-" vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
-" der Kommandozeile installieren\"]].</p>\n"
+#~ msgid " A new drive appears in the left pane. Click on it.\n"
+#~ msgstr " Ein neues Laufwerk erscheint im linken Fensterbereich. Klicken Sie darauf.\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
-msgstr ""
-" <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
-" Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
-" vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
-" der Kommandozeile installieren\"]].</p>\n"
+#, fuzzy
+#~| msgid ""
+#~| "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic"
+#~| "\" link=\"no\"]] button in the titlebar and choose <span class="
+#~| "\"guimenuitem\">Restore Disk Image&hellip;</span>."
+#~ 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>."
+#~ msgstr ""
+#~ "Klicken Sie in der Titelleiste des Fensters auf die Schaltfläche [[!img "
+#~ "lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] und "
+#~ "wählen Sie <span class=\"guimenuitem\">Laufwerksabbild "
+#~ "wiederherstellen&hellip;</span>."
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
+#, fuzzy
+#~| msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
+#~ " Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
+#~ " vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
+#~ " der Kommandozeile installieren\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Ein zwischenzeitliches Tails unter Nutzung der Kommandozeile installieren\n"
-" ----------------------------------------------------\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-"Notieren Sie sich den *Gerätenamen* des im rechten Fensterbereich "
-"angezeigten, ersten USB-Sticks. Der Gerätename sollte etwa wie `/dev/sdb`, `/"
-"dev/sdc`, usw. lauten."
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Ihre Version von <span class=\"application\">GNOME Disks</span> veraltet ist und die\n"
+#~ " Schaltfläche [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]] nicht\n"
+#~ " vorhanden ist, müssen Sie ein [[!toggle id=\"dd\" text=\"zwischenzeitliches Tails unter der Nutzung\n"
+#~ " der Kommandozeile installieren\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Falls Sie sich über den Gerätenamen unsicher sind, sollten Sie den Vorgang\n"
-" abbrechen. Anderenfalls riskieren Sie, jegliche Datenträger des Systems zu überschreiben.</p>\n"
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Öffnen Sie ein Terminal."
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Ein zwischenzeitliches Tails unter Nutzung der Kommandozeile installieren\n"
+#~ " ----------------------------------------------------\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Führen Sie folgenden Befehl aus und ersetzen Sie `[tails.iso]` mit dem Pfad "
-"zum ISO-Image, das Sie installieren wollen und `[gerät]` mit dem "
-"Gerätenamen, den Sie im ersten Schritt herausgefunden haben."
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Notieren Sie sich den *Gerätenamen* des im rechten Fensterbereich "
+#~ "angezeigten, ersten USB-Sticks. Der Gerätename sollte etwa wie `/dev/"
+#~ "sdb`, `/dev/sdc`, usw. lauten."
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[gerät] bs=16M && sync\n"
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Sie sich über den Gerätenamen unsicher sind, sollten Sie den Vorgang\n"
+#~ " abbrechen. Anderenfalls riskieren Sie, jegliche Datenträger des Systems zu überschreiben.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Hier ist ein Beispiel des auszuführenden Befehls, Ihrer ist wahrscheinlich anders:\n"
+#~ msgid "Open a terminal."
+#~ msgstr "Öffnen Sie ein Terminal."
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Führen Sie folgenden Befehl aus und ersetzen Sie `[tails.iso]` mit dem "
+#~ "Pfad zum ISO-Image, das Sie installieren wollen und `[gerät]` mit dem "
+#~ "Gerätenamen, den Sie im ersten Schritt herausgefunden haben."
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[gerät] bs=16M && sync\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Falls Sie sich nicht über den Pfad zum ISO-Image sicher sind oder Sie eine <span\n"
-" class=\"guilabel\">Datei oder Verzeichnis nicht gefunden</span> Fehlermeldung erhalten,\n"
-" können Sie zuerst <code>dd</code> gefolgt von einem Leerzeichen eingeben und dann das Symbol\n"
-" des ISO-Images per Drag and Drop aus einem Datei-Browser in das Terminal ziehen. Dies sollte den\n"
-" korrekten Pfad zum ISO-Image in das Terminal einfügen. Vervollständigen Sie anschließend den Befehl\n"
-" und führen Sie ihn aus.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Falls keine Fehlermeldung zurückgegeben wird, wird Tails auf den USB-Stick "
-"installiert.\n"
-"Die Installation dauert einige Minuten."
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Hier ist ein Beispiel des auszuführenden Befehls, Ihrer ist wahrscheinlich anders:\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Sie können nun mit dem nächsten Schritt fortfahren und [[diese Anweisungen\n"
-" auf einem anderen Gerät öffnen|usb#intermediary]].\n"
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-"Klicken Sie im Fenster <span class=\"guilabel\">Laufwerksabbild "
-"wiederherstellen</span> auf die Schaltfläche zur Auswahl von Dateien und "
-"wählen Sie das zuvor heruntergeladene ISO-Image aus."
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
-msgstr ""
-"Klicken Sie auf die Schaltfläche <span class=\"button\">Wiederherstellung "
-"starten&hellip;</span>."
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Falls Sie sich nicht über den Pfad zum ISO-Image sicher sind oder Sie eine <span\n"
+#~ " class=\"guilabel\">Datei oder Verzeichnis nicht gefunden</span> Fehlermeldung erhalten,\n"
+#~ " können Sie zuerst <code>dd</code> gefolgt von einem Leerzeichen eingeben und dann das Symbol\n"
+#~ " des ISO-Images per Drag and Drop aus einem Datei-Browser in das Terminal ziehen. Dies sollte den\n"
+#~ " korrekten Pfad zum ISO-Image in das Terminal einfügen. Vervollständigen Sie anschließend den Befehl\n"
+#~ " und führen Sie ihn aus.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
-msgstr ""
-"Klicken Sie im Bestätigunsfenster auf <span class=\"button"
-"\">Wiederherstellen</span>. Die Installation dauert einige Minuten."
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Falls keine Fehlermeldung zurückgegeben wird, wird Tails auf den USB-"
+#~ "Stick installiert.\n"
+#~ "Die Installation dauert einige Minuten."
-#. type: Bullet: '1. '
-msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
-msgstr ""
-"Klicken Sie auf die Schaltfläche [[!img lib/media-eject.png alt=\"Eject\" "
-"class=\"symbolic\" link=\"no\"]], nachdem die Installation beendet wurde."
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Sie können nun mit dem nächsten Schritt fortfahren und [[diese Anweisungen\n"
+#~ " auf einem anderen Gerät öffnen|usb#intermediary]].\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#~ "on the file selector button and choose the ISO image that you downloaded "
+#~ "earlier."
+#~ msgstr ""
+#~ "Klicken Sie im Fenster <span class=\"guilabel\">Laufwerksabbild "
+#~ "wiederherstellen</span> auf die Schaltfläche zur Auswahl von Dateien und "
+#~ "wählen Sie das zuvor heruntergeladene ISO-Image aus."
-#. 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 ""
+#~ "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+#~ msgstr ""
+#~ "Klicken Sie auf die Schaltfläche <span class=\"button\">Wiederherstellung "
+#~ "starten&hellip;</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.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#~ "The installation takes a few minutes."
+#~ msgstr ""
+#~ "Klicken Sie im Bestätigunsfenster auf <span class=\"button"
+#~ "\">Wiederherstellen</span>. Die Installation dauert einige Minuten."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "After the installation is finished, click on the [[!img lib/media-eject."
+#~ "png alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+#~ msgstr ""
+#~ "Klicken Sie auf die Schaltfläche [[!img lib/media-eject.png alt=\"Eject\" "
+#~ "class=\"symbolic\" link=\"no\"]], nachdem die Installation beendet wurde."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/install/linux/usb.es.po b/wiki/src/install/linux/usb.es.po
index 4383a10..768d463 100755
--- a/wiki/src/install/linux/usb.es.po
+++ b/wiki/src/install/linux/usb.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-linux-usb/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-linux-usb/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,10 +63,35 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png lin
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr "<p class=\"start\">Empezar en Linux.</p>\n"
+#. type: Title =
+#, no-wrap
+msgid "Install Tails\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Install <span class=\"application\">GNOME Disks</span>."
+msgid ""
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
+msgstr "Instalar <span class=\"application\">GNOME Disks</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " <div class=\"caution\">\n"
+msgid "<div class=\"caution\">\n"
+msgstr " <div class=\"caution\">\n"
+
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " </div>\n"
+msgid "</div>\n"
+msgstr " </div>\n"
#. type: Bullet: '1. '
msgid "Install <span class=\"application\">GNOME Disks</span>."
@@ -81,293 +106,232 @@ msgstr ""
"\">Discos de GNOME</span> debería venir instalado por defecto."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#| "package using the usual installation method for your Linux distribution."
msgid ""
"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
+"package using the usual installation method for your distribution."
msgstr ""
"Si no, instala el paquete <span class=\"code\">gnome-disk-utility</span> "
"utilizando el método habitual de instalación para tu distribución Linux."
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-"Comenzar <span class=\"application\">Discos de GNOME</span> (también llamada "
-"<span class=\"application\">Discos</span>)."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/install_final.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/install_final.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-" Por ejemplo, puedes elegir <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Aplicaciones</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilidades</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Discos</span></span>.\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 " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+msgid "XXX Step incorrectly numbered"
+msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr "Conecta la primer memoria USB a la computadora."
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr " Una nueva unidad de disco aparece en el panel de la izquierda. Haz click en ella.\n"
+#~ msgid ""
+#~ "Start <span class=\"application\">GNOME Disks</span> (also called <span "
+#~ "class=\"application\">Disks</span>)."
+#~ msgstr ""
+#~ "Comenzar <span class=\"application\">Discos de GNOME</span> (también "
+#~ "llamada <span class=\"application\">Discos</span>)."
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid ""
+#~ " For example, you can choose <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disks</span></span>.\n"
+#~ msgstr ""
+#~ " Por ejemplo, puedes elegir <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Aplicaciones</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilidades</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Discos</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. 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>."
-msgstr ""
-"Click en el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" "
-"link=\"no\"]] de la barra de título y elige <span class=\"guimenuitem"
-"\">Restaurar Imagen de Disco&hellip;</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgid "Plug the first USB stick in the computer."
+#~ msgstr "Conecta la primer memoria USB a la computadora."
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" Si tu versión de <span class=\"application\">Discos de GNOME</span> es vieja\n"
-" puede que tenga el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" en su lugar. Si es así, haz click en el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" y elige <span class=\"guimenuitem\">Restaurar Imagen de Disco&hellip;</span>.\n"
+#~ msgid " A new drive appears in the left pane. Click on it.\n"
+#~ msgstr " Una nueva unidad de disco aparece en el panel de la izquierda. Haz click en ella.\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
-msgstr ""
-" <p>Si tu versión de <span class=\"application\">Discos de GNOME</span> es todavía más vieja\n"
-" y no tiene el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] ni\n"
-" el [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" deberás [[!toggle id=\"dd\" text=\"instalar un Tails intermedio\n"
-" usando la línea de comandos\"]].</p>\n"
+#~ 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>."
+#~ msgstr ""
+#~ "Click en el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic"
+#~ "\" link=\"no\"]] de la barra de título y elige <span class=\"guimenuitem"
+#~ "\">Restaurar Imagen de Disco&hellip;</span>."
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " Si tu versión de <span class=\"application\">Discos de GNOME</span> es vieja\n"
+#~ " puede que tenga el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " en su lugar. Si es así, haz click en el botón [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " y elige <span class=\"guimenuitem\">Restaurar Imagen de Disco&hellip;</span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Instalar un Tails intermedio utilizando la línea de comandos\n"
-" ------------------------------------------------------------\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-"Toma nota del *nombre del dispositivo* de la primera memoria USB que se "
-"muestra en el panel de la derecha. El nombre del dispositivo debería ser "
-"algo así como `/dev/sdb`, `/dev/sdc`, etc."
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Si tu versión de <span class=\"application\">Discos de GNOME</span> es todavía más vieja\n"
+#~ " y no tiene el botón [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]] ni\n"
+#~ " el [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " deberás [[!toggle id=\"dd\" text=\"instalar un Tails intermedio\n"
+#~ " usando la línea de comandos\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Si no estás seguro del nombre del dispositivo, deberías dejar de proceder\n"
-" o te arriesgas a sobrescribir cualquier disco rígido de tu computadora.</p>\n"
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Abre una terminal."
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Instalar un Tails intermedio utilizando la línea de comandos\n"
+#~ " ------------------------------------------------------------\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Ejecuta el siguiente comando, reemplazando `[tails.iso]` por la ruta de la "
-"imagen ISO que quieres instalar y `[dispositivo]` con el nombre del "
-"dispositivo que anotaste en el paso 1."
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Toma nota del *nombre del dispositivo* de la primera memoria USB que se "
+#~ "muestra en el panel de la derecha. El nombre del dispositivo debería ser "
+#~ "algo así como `/dev/sdb`, `/dev/sdc`, etc."
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[dispositivo] bs=16M && sync\n"
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Si no estás seguro del nombre del dispositivo, deberías dejar de proceder\n"
+#~ " o te arriesgas a sobrescribir cualquier disco rígido de tu computadora.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Aquí hay un ejemplo del comando a ejecutar, el tuyo probablemente será diferente:\n"
+#~ msgid "Open a terminal."
+#~ msgstr "Abre una terminal."
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Ejecuta el siguiente comando, reemplazando `[tails.iso]` por la ruta de "
+#~ "la imagen ISO que quieres instalar y `[dispositivo]` con el nombre del "
+#~ "dispositivo que anotaste en el paso 1."
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[dispositivo] bs=16M && sync\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Si no estás seguro de la ruta de la imagen ISO o si recibes un mensaje de error <span\n"
-" class=\"guilabel\">No se ha encontrado el archivo o carpeta</span>, puedes escribir\n"
-" primero <code>dd</code>, seguido por un espacio, y luego arrastrar\n"
-" el ícono de la imagen ISO desde el explorador de archivos hasta la terminal. Haciendo eso\n"
-" deberías poder insertar la ruta correcta de la imagen ISO a la terminal. Luego completa el\n"
-" comando y ejecútalo.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Si no recibes ningún mensaje de error, Tails está siendo instalado en la "
-"memoria USB. La instalación dura un par de minutos."
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Aquí hay un ejemplo del comando a ejecutar, el tuyo probablemente será diferente:\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Puedes continuar ahora con el paso siguiente y [[Abrir estas instrucciones en\n"
-" otro dispositivo|usb#intermediary]].\n"
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-"En el mensaje de diálogo <span class=\"guimenuitem\">Restaurar la Imagen de "
-"Disco</span>, haz click en el botón de navegador de archivos y elige la "
-"imagen de ISO que descargaste antes."
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
-msgstr ""
-"Haz click en el botón <span class=\"button\">Iniciar Restauración&hellip;</"
-"span>."
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Si no estás seguro de la ruta de la imagen ISO o si recibes un mensaje de error <span\n"
+#~ " class=\"guilabel\">No se ha encontrado el archivo o carpeta</span>, puedes escribir\n"
+#~ " primero <code>dd</code>, seguido por un espacio, y luego arrastrar\n"
+#~ " el ícono de la imagen ISO desde el explorador de archivos hasta la terminal. Haciendo eso\n"
+#~ " deberías poder insertar la ruta correcta de la imagen ISO a la terminal. Luego completa el\n"
+#~ " comando y ejecútalo.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
-msgstr ""
-"En la ventana de confirmación, haz click en <span class=\"button"
-"\">Restaurar</span>. La instalación dura algunos minutos."
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Si no recibes ningún mensaje de error, Tails está siendo instalado en la "
+#~ "memoria USB. La instalación dura un par de minutos."
-#. type: Bullet: '1. '
-msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
-msgstr ""
-"Luego de que la instalación ha terminado, haz click en el botón [[!img lib/"
-"media-eject.png alt=\"Expulsar\" class=\"symbolic\" link=\"no\"]]."
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Puedes continuar ahora con el paso siguiente y [[Abrir estas instrucciones en\n"
+#~ " otro dispositivo|usb#intermediary]].\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#~ "on the file selector button and choose the ISO image that you downloaded "
+#~ "earlier."
+#~ msgstr ""
+#~ "En el mensaje de diálogo <span class=\"guimenuitem\">Restaurar la Imagen "
+#~ "de Disco</span>, haz click en el botón de navegador de archivos y elige "
+#~ "la imagen de ISO que descargaste antes."
-#. 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 ""
+#~ "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+#~ msgstr ""
+#~ "Haz click en el botón <span class=\"button\">Iniciar Restauración&hellip;"
+#~ "</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 ""
+#~ "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#~ "The installation takes a few minutes."
+#~ msgstr ""
+#~ "En la ventana de confirmación, haz click en <span class=\"button"
+#~ "\">Restaurar</span>. La instalación dura algunos minutos."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/restart_second_time.inline.es\" raw=\""
-"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "After the installation is finished, click on the [[!img lib/media-eject."
+#~ "png alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+#~ msgstr ""
+#~ "Luego de que la instalación ha terminado, haz click en el botón [[!img "
+#~ "lib/media-eject.png alt=\"Expulsar\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"install/inc/steps/create_persistence.inline.es\" raw=\""
-"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title="
diff --git a/wiki/src/install/linux/usb.fa.po b/wiki/src/install/linux/usb.fa.po
index 073b439..979b473 100644
--- a/wiki/src/install/linux/usb.fa.po
+++ b/wiki/src/install/linux/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+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"
@@ -61,231 +61,52 @@ msgstr ""
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\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>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
+msgid "Install Tails\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr ""
-
-#. type: Bullet: ' 1. '
msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
+msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid "Install <span class=\"application\">GNOME Disks</span>."
msgstr ""
-#. type: Bullet: '1. '
+#. type: Bullet: ' - '
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
+"If you are using the GNOME desktop environment, <span class=\"application"
+"\">GNOME Disks</span> should be installed by default."
msgstr ""
-#. type: Bullet: '1. '
+#. type: Bullet: ' - '
msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+"package using the usual installation method for your distribution."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_with_gnome_disks.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -294,13 +115,7 @@ msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "XXX Step incorrectly numbered"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/linux/usb.fr.po b/wiki/src/install/linux/usb.fr.po
index 4f85a0a..adeb460 100644
--- a/wiki/src/install/linux/usb.fr.po
+++ b/wiki/src/install/linux/usb.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2017-05-31 15:07-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -61,10 +61,35 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png lin
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr "<p class=\"start\">Démarrez Linux.</p>\n"
+#. type: Title =
+#, no-wrap
+msgid "Install Tails\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Install <span class=\"application\">GNOME Disks</span>."
+msgid ""
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
+msgstr "Installez <span class=\"application\">GNOME Disks</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " <div class=\"caution\">\n"
+msgid "<div class=\"caution\">\n"
+msgstr " <div class=\"caution\">\n"
+
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " </div>\n"
+msgid "</div>\n"
+msgstr " </div>\n"
#. type: Bullet: '1. '
msgid "Install <span class=\"application\">GNOME Disks</span>."
@@ -79,286 +104,233 @@ msgstr ""
"\">GNOME Disks</span> devrait être installé par défaut."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#| "package using the usual installation method for your Linux distribution."
msgid ""
"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
+"package using the usual installation method for your distribution."
msgstr ""
"Sinon, installez le paquet <span class=\"code\">gnome-disk-utility</span> en "
"utilisant la méthode habituelle d'installation de votre distribution Linux."
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-"Démarrez <span class=\"application\">GNOME Disks</span> (aussi appelé <span "
-"class=\"application\">Disques</span>)."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/install_final.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/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-" Par exemple, vous pouvez cliquer sur <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilitaires</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disques</span></span>.\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 " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+msgid "XXX Step incorrectly numbered"
+msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr "Branchez la première clé USB dans l'ordinateur."
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr " Un nouveau disque apparaît dans la panneau de gauche. Cliquez dessus.\n"
+#~ msgid ""
+#~ "Start <span class=\"application\">GNOME Disks</span> (also called <span "
+#~ "class=\"application\">Disks</span>)."
+#~ msgstr ""
+#~ "Démarrez <span class=\"application\">GNOME Disks</span> (aussi appelé "
+#~ "<span class=\"application\">Disques</span>)."
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid ""
+#~ " For example, you can choose <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disks</span></span>.\n"
+#~ msgstr ""
+#~ " Par exemple, vous pouvez cliquer sur <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilitaires</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disques</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. 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>."
-msgstr ""
-"Cliquez sur le bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic"
-"\" link=\"no\"]] dans la barre de titre puis sur <span class=\"guimenuitem"
-"\">Restaurer l'image disque&hellip;</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgid "Plug the first USB stick in the computer."
+#~ msgstr "Branchez la première clé USB dans l'ordinateur."
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" Si votre version de <span class=\"application\">GNOME Disques</span> est\n"
-" ancienne elle peut avoir à la place le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]].\n"
-" Cliquez sur le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]]\n"
-" et choisissez <span class=\"guimenuitem\">Restaurer l'image\n"
-" disque&hellip;</span>.\n"
+#~ msgid " A new drive appears in the left pane. Click on it.\n"
+#~ msgstr " Un nouveau disque apparaît dans la panneau de gauche. Cliquez dessus.\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
-msgstr ""
-" <p>Si votre version de <span class=\"application\">GNOME Disques</span> est encore plus ancienne\n"
-" et n'a ni un bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" ni un bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]],\n"
-" vous devez [[!toggle id=\"dd\" text=\"installer un Tails intermédiaire\n"
-" en utilisant la ligne de commande\"]].</p>\n"
+#~ 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>."
+#~ msgstr ""
+#~ "Cliquez sur le bouton [[!img lib/open-menu.png alt=\"Menu\" class="
+#~ "\"symbolic\" link=\"no\"]] dans la barre de titre puis sur <span class="
+#~ "\"guimenuitem\">Restaurer l'image disque&hellip;</span>."
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " Si votre version de <span class=\"application\">GNOME Disques</span> est\n"
+#~ " ancienne elle peut avoir à la place le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]].\n"
+#~ " Cliquez sur le bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " et choisissez <span class=\"guimenuitem\">Restaurer l'image\n"
+#~ " disque&hellip;</span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Installer un Tails intermédiaire en ligne de commande\n"
-" ----------------------------------------------------\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-"Notez le *nom du périphérique* de la première clé USB affichée dans le "
-"panneau de droite. Le nom du périphérique devrait être quelque chose comme `/"
-"dev/sdb`, `/dev/sdc`, etc."
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Si votre version de <span class=\"application\">GNOME Disques</span> est encore plus ancienne\n"
+#~ " et n'a ni un bouton [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " ni un bouton [[!img lib/emblem-system.png alt=\"Système\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " vous devez [[!toggle id=\"dd\" text=\"installer un Tails intermédiaire\n"
+#~ " en utilisant la ligne de commande\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Si vous n'êtes pas sûr du nom du périphérique, vous devriez arrêter car vous\n"
-" risqueriez d'écraser les données de n'importe quel disque dur de l'ordinateur.</p>\n"
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Ouvrez un terminal."
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Installer un Tails intermédiaire en ligne de commande\n"
+#~ " ----------------------------------------------------\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Exécutez la commande suivante, en remplaçant `[tails.iso]`par le chemin de "
-"l'image iso que vous voulez installer et `[device]` par le nom du "
-"périphérique trouvé à l'étape 1."
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Notez le *nom du périphérique* de la première clé USB affichée dans le "
+#~ "panneau de droite. Le nom du périphérique devrait être quelque chose "
+#~ "comme `/dev/sdb`, `/dev/sdc`, etc."
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Si vous n'êtes pas sûr du nom du périphérique, vous devriez arrêter car vous\n"
+#~ " risqueriez d'écraser les données de n'importe quel disque dur de l'ordinateur.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Voici un exemple de commande à exécuter, la votre sera sûrement différente :\n"
+#~ msgid "Open a terminal."
+#~ msgstr "Ouvrez un terminal."
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Exécutez la commande suivante, en remplaçant `[tails.iso]`par le chemin "
+#~ "de l'image iso que vous voulez installer et `[device]` par le nom du "
+#~ "périphérique trouvé à l'étape 1."
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Si vous n'êtes pas sûr de l'emplacement de l'image ISO ou si vous obtenez un message d'erreur <span\n"
-" class=\"guilabel\">Aucun fichier ou dossier de ce type</span>, vous pouvez d'abord\n"
-" taper <code>dd</code>, suivit par un espace, puis glisser et déposer\n"
-" l'icône de l'image ISO d'un navigateur de fichier vers le terminal. Cela devrait\n"
-" insérer le chemin de l'image ISO dans le terminal. Puis complétez la\n"
-" commande et exécutez la.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Si aucun message d'erreur n’apparaît, Tails est en cours d'installation sur "
-"la clé USB. Cela dure quelques minutes."
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Voici un exemple de commande à exécuter, la votre sera sûrement différente :\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Vous pouvez maintenant passer à l'étape suivante et [[Ouvrir ces instructions sur un\n"
-" autre périphérique|usb#intermediary]].\n"
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-"Dans la boite de dialogue <span class=\"guimenuitem\">Restaurer l'image "
-"disque</span>, cliquez sur le bouton du navigateur de fichier et choisissez "
-"l'image ISO que vous avez téléchargé plus tôt."
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
-msgstr ""
-"Cliquez sur le bouton <span class=\"button\">Démarrer la restauration&hellip;"
-"</span>."
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Si vous n'êtes pas sûr de l'emplacement de l'image ISO ou si vous obtenez un message d'erreur <span\n"
+#~ " class=\"guilabel\">Aucun fichier ou dossier de ce type</span>, vous pouvez d'abord\n"
+#~ " taper <code>dd</code>, suivit par un espace, puis glisser et déposer\n"
+#~ " l'icône de l'image ISO d'un navigateur de fichier vers le terminal. Cela devrait\n"
+#~ " insérer le chemin de l'image ISO dans le terminal. Puis complétez la\n"
+#~ " commande et exécutez la.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
-msgstr ""
-"Dans la fenêtre de confirmation, cliquez sur <span class=\"button"
-"\">Restaurer</span>. L'installation dure quelques minutes."
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Si aucun message d'erreur n’apparaît, Tails est en cours d'installation "
+#~ "sur la clé USB. Cela dure quelques minutes."
-#. type: Bullet: '1. '
-msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
-msgstr ""
-"Une fois l'installation terminée, cliquez sur le bouton [[!img lib/media-"
-"eject.png alt=\"Éjecter\" class=\"symbolic\" link=\"no\"]]."
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Vous pouvez maintenant passer à l'étape suivante et [[Ouvrir ces instructions sur un\n"
+#~ " autre périphérique|usb#intermediary]].\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#~ "on the file selector button and choose the ISO image that you downloaded "
+#~ "earlier."
+#~ msgstr ""
+#~ "Dans la boite de dialogue <span class=\"guimenuitem\">Restaurer l'image "
+#~ "disque</span>, cliquez sur le bouton du navigateur de fichier et "
+#~ "choisissez l'image ISO que vous avez téléchargé plus tôt."
-#. 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 ""
+#~ "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+#~ msgstr ""
+#~ "Cliquez sur le bouton <span class=\"button\">Démarrer la "
+#~ "restauration&hellip;</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 ""
+#~ "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#~ "The installation takes a few minutes."
+#~ msgstr ""
+#~ "Dans la fenêtre de confirmation, cliquez sur <span class=\"button"
+#~ "\">Restaurer</span>. L'installation dure quelques minutes."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "After the installation is finished, click on the [[!img lib/media-eject."
+#~ "png alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+#~ msgstr ""
+#~ "Une fois l'installation terminée, cliquez sur le bouton [[!img lib/media-"
+#~ "eject.png alt=\"Éjecter\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/install/linux/usb.it.po b/wiki/src/install/linux/usb.it.po
index 8840c11..e821e4c 100644
--- a/wiki/src/install/linux/usb.it.po
+++ b/wiki/src/install/linux/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2016-07-17 15:57+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -63,10 +63,35 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png lin
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr "<p class=\"start\">Avviare in Linux.</p>\n"
+#. type: Title =
+#, no-wrap
+msgid "Install Tails\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Install <span class=\"application\">GNOME Disks</span>."
+msgid ""
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
+msgstr "Installa <span class=\"application\">GNOME Disks</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " <div class=\"caution\">\n"
+msgid "<div class=\"caution\">\n"
+msgstr " <div class=\"caution\">\n"
+
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " </div>\n"
+msgid "</div>\n"
+msgstr " </div>\n"
#. type: Bullet: '1. '
msgid "Install <span class=\"application\">GNOME Disks</span>."
@@ -81,299 +106,249 @@ msgstr ""
"Disks</span> dovrebbe essere installato di default."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+#| "package using the usual installation method for your Linux distribution."
msgid ""
"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
+"package using the usual installation method for your distribution."
msgstr ""
"Altrimenti, installa il pacchetto <span class=\"code\">gnome-disk-utility</"
"span> usando i metodi di installazione usuali per la tua distribuzione Linux."
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-"Avvia <span class=\"application\">GNOME Disks</span> (chiamata anche <span "
-"class=\"application\">Disks</span>)."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/install_final.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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-" Per esempio, puoi scegliere <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\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\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+msgid "XXX Step incorrectly numbered"
+msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr "Collega la prima chiave USB al computer."
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr " Un nuovo dispositivo apparirà nel pannello di sinistra. Cliccaci sopra.\n"
+#~ msgid ""
+#~ "Start <span class=\"application\">GNOME Disks</span> (also called <span "
+#~ "class=\"application\">Disks</span>)."
+#~ msgstr ""
+#~ "Avvia <span class=\"application\">GNOME Disks</span> (chiamata anche "
+#~ "<span class=\"application\">Disks</span>)."
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid ""
+#~ " For example, you can choose <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disks</span></span>.\n"
+#~ msgstr ""
+#~ " Per esempio, puoi scegliere <span class=\"menuchoice\">\n"
+#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#~ " <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+#~ " <span class=\"guimenuitem\">Disks</span></span>.\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic"
-#| "\" link=\"no\"]] button in the titlebar and choose <span class="
-#| "\"guimenuitem\">Restore Disk Image&hellip;</span>."
-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>."
-msgstr ""
-"Clicca sul pulsante [[!img lib/emblem-system.png alt=\"System\" class="
-"\"symbolic\" link=\"no\"]] nella barra del titolo e scegli <span class="
-"\"guimenuitem\">Restore Disk Image&hellip;</span>."
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid "Plug the first USB stick in the computer."
+#~ msgstr "Collega la prima chiave USB al computer."
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-" <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
-" e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
-" devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
-" usando la riga di comando\"]].</p>\n"
+#~ msgid " A new drive appears in the left pane. Click on it.\n"
+#~ msgstr " Un nuovo dispositivo apparirà nel pannello di sinistra. Cliccaci sopra.\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
-msgstr " <div class=\"bug\">\n"
+#~ msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
-#| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-#| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-#| " using the command line\"]].</p>\n"
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
-msgstr ""
-" <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
-" e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
-" devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
-" usando la riga di comando\"]].</p>\n"
+#, fuzzy
+#~| msgid ""
+#~| "Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic"
+#~| "\" link=\"no\"]] button in the titlebar and choose <span class="
+#~| "\"guimenuitem\">Restore Disk Image&hellip;</span>."
+#~ 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>."
+#~ msgstr ""
+#~ "Clicca sul pulsante [[!img lib/emblem-system.png alt=\"System\" class="
+#~ "\"symbolic\" link=\"no\"]] nella barra del titolo e scegli <span class="
+#~ "\"guimenuitem\">Restore Disk Image&hellip;</span>."
-#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
-msgstr " </div>\n"
+#, fuzzy
+#~| msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr "[[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " If your version of <span class=\"application\">GNOME Disks</span> is\n"
+#~ " old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button and choose <span class=\"guimenuitem\">Restore Disk\n"
+#~ " Image&hellip;</span>.\n"
+#~ msgstr ""
+#~ " <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
+#~ " e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
+#~ " usando la riga di comando\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-" Installa una Tails intermediaria usando la riga di comando\n"
-" ----------------------------------------------------\n"
+#~ msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
+#~ msgstr " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-"Prendi nota del *nome del dispositivo* della prima chiave USB come mostrato "
-"nel pannello di sinistra. Il nome del dispostivo dovrebbe essere qualcosa "
-"come `/dev/sdb`, `/dev/sdc`, etc."
+#~ msgid " <div class=\"bug\">\n"
+#~ msgstr " <div class=\"bug\">\n"
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr " <div class=\"caution\">\n"
+#, fuzzy
+#~| msgid ""
+#~| " <p>If your version of <span class=\"application\">GNOME Disks</span> is old\n"
+#~| " and has no [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~| " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~| " using the command line\"]].</p>\n"
+#~ msgid ""
+#~ " <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
+#~ " and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
+#~ " button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
+#~ " using the command line\"]].</p>\n"
+#~ msgstr ""
+#~ " <p>Se la tua versione di <span class=\"application\">GNOME Disks</span> è vecchia\n"
+#~ " e non ha il pulsante [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]],\n"
+#~ " devi [[!toggle id=\"dd\" text=\"installare una Tails intermediaria\n"
+#~ " usando la riga di comando\"]].</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-" <p>Se non sei sicura del nome del dispositivo, dovresti fermarti oppure\n"
-" rischi di sovrascrivere un qualche hard disk del computer.</p>\n"
+#~ msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
+#~ msgstr " [[!toggleable id=\"dd\" text=\"\"\"\n"
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr "Apri un terminale."
+#~ msgid ""
+#~ " Install an intermediary Tails using the command line\n"
+#~ " ----------------------------------------------------\n"
+#~ msgstr ""
+#~ " Installa una Tails intermediaria usando la riga di comando\n"
+#~ " ----------------------------------------------------\n"
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-"Esegui il seguente comando, sostituendo '[tails.iso]' con il percorso "
-"all'immagine ISO che vuoi installare e '[device]' con il nome del "
-"dispositivo trovato nel primo passaggio."
+#~ msgid ""
+#~ "Take note of the *device name* of the first USB stick as displayed in the "
+#~ "right pane. The device name should be something like `/dev/sdb`, `/dev/"
+#~ "sdc`, etc."
+#~ msgstr ""
+#~ "Prendi nota del *nome del dispositivo* della prima chiave USB come "
+#~ "mostrato nel pannello di sinistra. Il nome del dispostivo dovrebbe essere "
+#~ "qualcosa come `/dev/sdb`, `/dev/sdc`, etc."
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgid ""
+#~ " <p>If you are not sure about the device name, you should stop proceeding or\n"
+#~ " you risk overwriting any hard disk on the computer.</p>\n"
+#~ msgstr ""
+#~ " <p>Se non sei sicura del nome del dispositivo, dovresti fermarti oppure\n"
+#~ " rischi di sovrascrivere un qualche hard disk del computer.</p>\n"
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr " Qui c'è un esempio del comando da eseguire, il tuo sarà probabilmente differente:\n"
+#~ msgid "Open a terminal."
+#~ msgstr "Apri un terminale."
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgid ""
+#~ "Execute the following command, replacing `[tails.iso]` with the path to "
+#~ "the ISO image that you want to install and `[device]` with the device "
+#~ "name found in step 1."
+#~ msgstr ""
+#~ "Esegui il seguente comando, sostituendo '[tails.iso]' con il percorso "
+#~ "all'immagine ISO che vuoi installare e '[device]' con il nome del "
+#~ "dispositivo trovato nel primo passaggio."
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr " <div class=\"tip\">\n"
+#~ msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
+#~ msgstr " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-" <p>Se non sei sicura del percorso dell'immagine ISOo se ricevi un messaggio\n"
-" d'errore <span class=\"guilabel\">No such file or directory</span>, puoi prima\n"
-" digitare <code>dd</code>, seguito da uno spazio, e poi trascinare e lasciare\n"
-" l'incona dell'immagine ISO da un file browser dentro il terminale. Fare questo \n"
-" dovrebbe inserire il percorso corretto dell'immagine ISO nel terminale. Poi completa\n"
-" il comando ed eseguilo.</p>\n"
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-"Se non ritorna un messaggio di errore, Tails è in fase di installazione "
-"sulla chiave USB. L'installazione richiede alcuni minuti."
+#~ msgid " Here is an example of command to execute, yours is probably different:\n"
+#~ msgstr " Qui c'è un esempio del comando da eseguire, il tuo sarà probabilmente differente:\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-" Puoi continuare con i prossimi passi e [[Aprire queste istruzioni su un\n"
-" altro dispositivo| usb#intermediary]].\n"
+#~ msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
+#~ msgstr " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-"Nella finestra di dialogo <span class=\"guilabel\">Restore Disk Image</"
-"span> , clicca sul pulsante che seleziona i file e scegli l'immagine ISO che "
-"hai scaricato precedentemente."
+#~ msgid " <div class=\"tip\">\n"
+#~ msgstr " <div class=\"tip\">\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
-msgstr ""
-"Clicca sul pulsante <span class=\"button\">Start Restoring&hellip;</span>."
+#~ msgid ""
+#~ " <p>If you are not sure about the path to the ISO image or if you get a <span\n"
+#~ " class=\"guilabel\">No such file or directory</span> error message, you can\n"
+#~ " first type <code>dd</code>, followed by a space, and then drag and drop the\n"
+#~ " icon of the ISO image from a file browser onto the terminal. Doing so should\n"
+#~ " insert the correct path to the ISO image in the terminal. Then complete the\n"
+#~ " command and execute it.</p>\n"
+#~ msgstr ""
+#~ " <p>Se non sei sicura del percorso dell'immagine ISOo se ricevi un messaggio\n"
+#~ " d'errore <span class=\"guilabel\">No such file or directory</span>, puoi prima\n"
+#~ " digitare <code>dd</code>, seguito da uno spazio, e poi trascinare e lasciare\n"
+#~ " l'incona dell'immagine ISO da un file browser dentro il terminale. Fare questo \n"
+#~ " dovrebbe inserire il percorso corretto dell'immagine ISO nel terminale. Poi completa\n"
+#~ " il comando ed eseguilo.</p>\n"
-#. type: Bullet: '1. '
-msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
-msgstr ""
-"Nella finestra di conferma, clicca <span class=\"button\">Restore</span>. "
-"L'installazione richiede alcuni minuti."
+#~ msgid ""
+#~ "If no error message is returned, Tails is being install on the USB "
+#~ "stick. The installation takes a few minutes."
+#~ msgstr ""
+#~ "Se non ritorna un messaggio di errore, Tails è in fase di installazione "
+#~ "sulla chiave USB. L'installazione richiede alcuni minuti."
-#. type: Bullet: '1. '
-msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
-msgstr ""
-"Una volta che l'installazione è completata, clicca sul pulsante [[!img lib/"
-"media-eject.png alt=\"Eject\" class=\"symbolic\" link=\"no\"]]."
+#~ msgid ""
+#~ " You can now continue with the next step and [[Open these instructions on\n"
+#~ " another device|usb#intermediary]].\n"
+#~ msgstr ""
+#~ " Puoi continuare con i prossimi passi e [[Aprire queste istruzioni su un\n"
+#~ " altro dispositivo| usb#intermediary]].\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click "
+#~ "on the file selector button and choose the ISO image that you downloaded "
+#~ "earlier."
+#~ msgstr ""
+#~ "Nella finestra di dialogo <span class=\"guilabel\">Restore Disk Image</"
+#~ "span> , clicca sul pulsante che seleziona i file e scegli l'immagine ISO "
+#~ "che hai scaricato precedentemente."
-#. 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\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+#~ msgstr ""
+#~ "Clicca sul pulsante <span class=\"button\">Start Restoring&hellip;</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\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "In the confirmation dialog click <span class=\"button\">Restore</span>. "
+#~ "The installation takes a few minutes."
+#~ msgstr ""
+#~ "Nella finestra di conferma, clicca <span class=\"button\">Restore</span>. "
+#~ "L'installazione richiede alcuni minuti."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "After the installation is finished, click on the [[!img lib/media-eject."
+#~ "png alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+#~ msgstr ""
+#~ "Una volta che l'installazione è completata, clicca sul pulsante [[!img "
+#~ "lib/media-eject.png alt=\"Eject\" class=\"symbolic\" link=\"no\"]]."
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
#~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
diff --git a/wiki/src/install/linux/usb.pt.po b/wiki/src/install/linux/usb.pt.po
index 120e69d..10aeeb8 100644
--- a/wiki/src/install/linux/usb.pt.po
+++ b/wiki/src/install/linux/usb.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,232 +63,56 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-linux.png lin
msgid "<p class=\"start\">Start in Linux.</p>\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_intro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Install <span class=\"application\">GNOME Disks</span>."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you are using the GNOME desktop environment, <span class=\"application"
-"\">GNOME Disks</span> should be installed by default."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
-"package using the usual installation method for your Linux distribution."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start <span class=\"application\">GNOME Disks</span> (also called <span "
-"class=\"application\">Disks</span>)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" For example, you can choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Disks</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/icons/gnome-disks.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/plug-first-usb.png link=\"no\" alt=\"\"]]</div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Plug the first USB stick in the computer."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " A new drive appears in the left pane. Click on it.\n"
-msgstr ""
-
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_drive.png link=\"no\" alt=\"\"]]\n"
+msgid "Install Tails\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <div class=\"step-image\">[[!img install/inc/infography/install-intermediary-tails.png link=\"no\" alt=\"\"]]</div>\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>."
+"In this step, you will install Tails on a USB stick using\n"
+"<span class=\"application\">GNOME Disks</span>.\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_menu.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If your version of <span class=\"application\">GNOME Disks</span> is\n"
-" old it might have a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button instead. Click on the [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button and choose <span class=\"guimenuitem\">Restore Disk\n"
-" Image&hellip;</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/gnome_disks_system.png link=\"no\" alt=\"\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"bug\">\n"
+#, fuzzy, no-wrap
+#| msgid " <div class=\"bug\">\n"
+msgid "<div class=\"caution\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
-msgid ""
-" <p>If your version of <span class=\"application\">GNOME Disks</span> is even older\n"
-" and has neither a [[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]\n"
-" nor a [[!img lib/emblem-system.png alt=\"System\" class=\"symbolic\" link=\"no\"]]\n"
-" button, you have to [[!toggle id=\"dd\" text=\"install an intermediary Tails\n"
-" using the command line\"]].</p>\n"
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " </div>\n"
+#, fuzzy, no-wrap
+#| msgid " </div>\n"
+msgid "</div>\n"
msgstr " </div>\n"
-#. type: Plain text
-#, no-wrap
-msgid " [[!toggleable id=\"dd\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Install an intermediary Tails using the command line\n"
-" ----------------------------------------------------\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Take note of the *device name* of the first USB stick as displayed in the "
-"right pane. The device name should be something like `/dev/sdb`, `/dev/sdc`, "
-"etc."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the device name, you should stop proceeding or\n"
-" you risk overwriting any hard disk on the computer.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid "Open a terminal."
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Execute the following command, replacing `[tails.iso]` with the path to the "
-"ISO image that you want to install and `[device]` with the device name found "
-"in step 1."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if=[tails.iso] of=[device] bs=16M && sync\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Here is an example of command to execute, yours is probably different:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " dd if='/home/amnesia/tails-2.0.iso' of=/dev/sdc bs=16M && sync\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>If you are not sure about the path to the ISO image or if you get a <span\n"
-" class=\"guilabel\">No such file or directory</span> error message, you can\n"
-" first type <code>dd</code>, followed by a space, and then drag and drop the\n"
-" icon of the ISO image from a file browser onto the terminal. Doing so should\n"
-" insert the correct path to the ISO image in the terminal. Then complete the\n"
-" command and execute it.</p>\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"If no error message is returned, Tails is being install on the USB stick. "
-"The installation takes a few minutes."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" You can now continue with the next step and [[Open these instructions on\n"
-" another device|usb#intermediary]].\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the <span class=\"guilabel\">Restore Disk Image</span> dialog, click on "
-"the file selector button and choose the ISO image that you downloaded "
-"earlier."
-msgstr ""
-
#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button\">Start Restoring&hellip;</span> button."
+msgid "Install <span class=\"application\">GNOME Disks</span>."
msgstr ""
-#. type: Bullet: '1. '
+#. type: Bullet: ' - '
msgid ""
-"In the confirmation dialog click <span class=\"button\">Restore</span>. The "
-"installation takes a few minutes."
+"If you are using the GNOME desktop environment, <span class=\"application"
+"\">GNOME Disks</span> should be installed by default."
msgstr ""
-#. type: Bullet: '1. '
+#. type: Bullet: ' - '
msgid ""
-"After the installation is finished, click on the [[!img lib/media-eject.png "
-"alt=\"Eject\" class=\"symbolic\" link=\"no\"]] button."
+"Otherwise, install the <span class=\"code\">gnome-disk-utility</span> "
+"package using the usual installation method for your distribution."
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_intermediary_outro.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/install_final.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/install_final.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -296,13 +120,7 @@ msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes
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"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/restart_second_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "XXX Step incorrectly numbered"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/upgrade/tails.de.po b/wiki/src/upgrade/tails.de.po
index 3e444f2..d8b0c91 100644
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.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-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-16 13:40+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
@@ -113,106 +113,99 @@ msgstr ""
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."
-
#. 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/install_final.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/install_final.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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final.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 "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 +215,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 f33805b..cc344e6 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-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-05-10 07:55+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -108,104 +108,95 @@ msgstr "<p>El almacenamiento persistente de tu memoria USB no se copiará.</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"
-#. type: Bullet: '1. '
-msgid "Plug the intermediary USB stick in the computer."
-msgstr "Conecta la memoria USB intermediaria en la computadora."
-
#. 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/install_final.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/install_final.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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final.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 "Plug the intermediary USB stick in the computer."
+#~ msgstr "Conecta la memoria USB intermediaria en la computadora."
-#. 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 ""
-"Usa la lista desplegable de <span class=\"guilabel\">Dispositivo de Destino</"
-"span> para especificar la memoria USB intemedia."
+#~ 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: 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 " [[!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 ""
-"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 " <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 " The installation takes a few minutes.\n"
-msgstr " La instalación dura algunos minutos.\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 ""
-" <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"
+#, 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 ""
+#~ "Usa la lista desplegable de <span class=\"guilabel\">Dispositivo de "
+#~ "Destino</span> para especificar la memoria USB intemedia."
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Cierra el <span class=\"application\">Tails Installer</span>."
+#~ 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>."
-#. 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 ""
+#~ "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."
-#. 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 " 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"
@@ -214,19 +205,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"
@@ -239,7 +236,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..d75435f 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-09-10 16:24+0000\n"
"PO-Revision-Date: 2018-03-16 13:44+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
@@ -104,72 +104,11 @@ msgstr ""
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"
-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
@@ -180,10 +119,3 @@ msgstr ""
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_final.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..c1351b7 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-09-10 16:24+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"
@@ -108,101 +108,91 @@ msgstr ""
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."
-
#. 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/install_final.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/install_final.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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final.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 "Plug the intermediary USB stick in the computer."
+#~ msgstr "Brancher la clé USB intermédiaire dans l'ordinateur."
-#. 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 ""
+#~ "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: 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 " [[!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 ""
-"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 " <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 " The installation takes a few minutes.\n"
-msgstr " L'installation prend quelques minutes.\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 ""
-" <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 ""
+#~ "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."
-#. type: Bullet: '1. '
-msgid "Close <span class=\"application\">Tails Installer</span>."
-msgstr "Fermer l'<span class=\"application\">Installeur de Tails</span>."
+#~ 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>."
-#. 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 ""
+#~ "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."
-#. 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 " 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 +201,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 +233,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 7fa834d..5d1e873 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-09-10 16:24+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"
@@ -113,106 +113,97 @@ msgstr ""
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"
-
#. 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/install_final.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/install_final.inline\" 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\" 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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" 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 "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\" 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\" 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.pt.po b/wiki/src/upgrade/tails.pt.po
index 67d0e18..eff0ca3 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-09-10 16:24+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"
@@ -110,110 +110,101 @@ msgstr ""
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."
-
-# 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/install_final.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/install_final.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/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.pt\" raw=\"yes\" sort=\"age\"]]\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.
-#. type: Bullet: '1. '
+#~ 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 "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 " [[!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"
-#. type: Bullet: '1. '
+# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#, 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 "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. '
-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>."
+#, 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 ""
+#~ "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"