summaryrefslogtreecommitdiffstats
path: root/wiki/src/install
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2017-10-24 14:27:29 +0200
committerbertagaz <bertagaz@ptitcanardnoir.org>2017-10-24 14:27:29 +0200
commit15eb5d7ad7627916f1de3683071a79bb4b45f640 (patch)
tree766be2f5706de4d3d10e77b1efbbade9f9ae95b4 /wiki/src/install
parent283014a4879a53f8786c73617803d4eeb7f84d97 (diff)
parent6ead712ff789c9e7f783f6f817bbd6f3d41614fe (diff)
Merge remote-tracking branch 'origin/stable' into bugfix/10494-retry-curl-in-htpdate
Diffstat (limited to 'wiki/src/install')
-rw-r--r--wiki/src/install/debian.de.po4
-rw-r--r--wiki/src/install/debian.fa.po2
-rw-r--r--wiki/src/install/debian.fr.po4
-rw-r--r--wiki/src/install/debian.html2
-rw-r--r--wiki/src/install/debian.it.po4
-rw-r--r--wiki/src/install/debian.pt.po2
-rw-r--r--wiki/src/install/debian/usb.de.po7
-rw-r--r--wiki/src/install/debian/usb.fa.po4
-rw-r--r--wiki/src/install/debian/usb.fr.po52
-rw-r--r--wiki/src/install/debian/usb.it.po16
-rw-r--r--wiki/src/install/debian/usb.mdwn2
-rw-r--r--wiki/src/install/debian/usb.pt.po4
-rw-r--r--wiki/src/install/download/openpgp.de.po61
-rw-r--r--wiki/src/install/download/openpgp.fa.po67
-rw-r--r--wiki/src/install/download/openpgp.fr.po66
-rw-r--r--wiki/src/install/download/openpgp.it.po61
-rw-r--r--wiki/src/install/download/openpgp.mdwn12
-rw-r--r--wiki/src/install/download/openpgp.pt.po36
-rw-r--r--wiki/src/install/download_2.de.po29
-rw-r--r--wiki/src/install/download_2.fa.po29
-rw-r--r--wiki/src/install/download_2.fr.po29
-rw-r--r--wiki/src/install/download_2.html10
-rw-r--r--wiki/src/install/download_2.it.po29
-rw-r--r--wiki/src/install/download_2.pt.po29
-rw-r--r--wiki/src/install/expert/usb.de.po7
-rw-r--r--wiki/src/install/expert/usb.fa.po4
-rw-r--r--wiki/src/install/expert/usb.fr.po7
-rw-r--r--wiki/src/install/expert/usb.it.po7
-rw-r--r--wiki/src/install/expert/usb.mdwn2
-rw-r--r--wiki/src/install/expert/usb.pt.po4
-rw-r--r--wiki/src/install/inc/infography/plug-other-usb.pngbin2558 -> 0 bytes
-rw-r--r--wiki/src/install/inc/js/dave_2.js192
-rw-r--r--wiki/src/install/inc/overview.de.po4
-rw-r--r--wiki/src/install/inc/overview.fa.po2
-rw-r--r--wiki/src/install/inc/overview.fr.po4
-rw-r--r--wiki/src/install/inc/overview.html6
-rw-r--r--wiki/src/install/inc/overview.it.po4
-rw-r--r--wiki/src/install/inc/overview.pt.po4
-rw-r--r--wiki/src/install/inc/router/clone.de.po4
-rw-r--r--wiki/src/install/inc/router/clone.fa.po2
-rw-r--r--wiki/src/install/inc/router/clone.fr.po4
-rw-r--r--wiki/src/install/inc/router/clone.html2
-rw-r--r--wiki/src/install/inc/router/clone.it.po4
-rw-r--r--wiki/src/install/inc/router/clone.pt.po4
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_in_tails.pngbin67553 -> 20642 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_upgrade_in_tails.pngbin0 -> 21270 bytes
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.de.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fa.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fr.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.html116
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.it.po251
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.pt.po251
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po76
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po41
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po108
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.it.po70
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn34
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po54
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.de.po370
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po280
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po347
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.it.po346
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn136
-rw-r--r--wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po335
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po15
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po9
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po15
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.it.po21
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn3
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po9
-rw-r--r--wiki/src/install/inc/stylesheets/dave.css2
-rw-r--r--wiki/src/install/inc/stylesheets/dave_2.css76
-rw-r--r--wiki/src/install/linux.de.po8
-rw-r--r--wiki/src/install/linux.fa.po2
-rw-r--r--wiki/src/install/linux.fr.po4
-rw-r--r--wiki/src/install/linux.html2
-rw-r--r--wiki/src/install/linux.it.po4
-rw-r--r--wiki/src/install/linux.pt.po2
-rw-r--r--wiki/src/install/mac/usb.de.po12
-rw-r--r--wiki/src/install/mac/usb.fa.po6
-rw-r--r--wiki/src/install/mac/usb.fr.po48
-rw-r--r--wiki/src/install/mac/usb.it.po12
-rw-r--r--wiki/src/install/mac/usb.mdwn6
-rw-r--r--wiki/src/install/mac/usb.pt.po6
-rw-r--r--wiki/src/install/v1/Tails/amd64/stable/latest.yml6
-rw-r--r--wiki/src/install/v1/Tails/i386/stable/latest.yml6
-rw-r--r--wiki/src/install/win.de.po4
-rw-r--r--wiki/src/install/win.fa.po2
-rw-r--r--wiki/src/install/win.fr.po4
-rw-r--r--wiki/src/install/win.html2
-rw-r--r--wiki/src/install/win.it.po4
-rw-r--r--wiki/src/install/win.pt.po2
-rw-r--r--wiki/src/install/win/usb.de.po4
-rw-r--r--wiki/src/install/win/usb.fa.po4
-rw-r--r--wiki/src/install/win/usb.fr.po12
-rw-r--r--wiki/src/install/win/usb.it.po4
-rw-r--r--wiki/src/install/win/usb.mdwn2
-rw-r--r--wiki/src/install/win/usb.pt.po4
98 files changed, 4161 insertions, 557 deletions
diff --git a/wiki/src/install/debian.de.po b/wiki/src/install/debian.de.po
index f37c6ba..b9c8ca0 100644
--- a/wiki/src/install/debian.de.po
+++ b/wiki/src/install/debian.de.po
@@ -59,8 +59,8 @@ msgid "You need:"
msgstr "Sie benötigen:"
#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 USB-Stick <small>(mindestens 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 USB-Stick <small>(mindestens 8 GB)</small>"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/debian.fa.po b/wiki/src/install/debian.fa.po
index 706d00f..8bf7478 100644
--- a/wiki/src/install/debian.fa.po
+++ b/wiki/src/install/debian.fa.po
@@ -55,7 +55,7 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
diff --git a/wiki/src/install/debian.fr.po b/wiki/src/install/debian.fr.po
index 720e0c5..17b149a 100644
--- a/wiki/src/install/debian.fr.po
+++ b/wiki/src/install/debian.fr.po
@@ -57,8 +57,8 @@ msgid "You need:"
msgstr "Vous avez besoin de :"
#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 clé USB <small>(d'au moins 4 Go)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 clé USB <small>(d'au moins 8 Go)</small>"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/debian.html b/wiki/src/install/debian.html
index 3c0fb0b..c81d69d 100644
--- a/wiki/src/install/debian.html
+++ b/wiki/src/install/debian.html
@@ -30,7 +30,7 @@
<h4>You need:</h4>
<ul>
- <li>1 USB stick <small>(at least 4 GB)</small></li>
+ <li>1 USB stick <small>(at least 8 GB)</small></li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
<li>½ hour to install</li>
</ul>
diff --git a/wiki/src/install/debian.it.po b/wiki/src/install/debian.it.po
index 7dff845..68bc0db 100644
--- a/wiki/src/install/debian.it.po
+++ b/wiki/src/install/debian.it.po
@@ -58,8 +58,8 @@ msgid "You need:"
msgstr "Ti servono:"
#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 chiavetta USB <small>(almeno 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 chiavetta USB <small>(almeno 8 GB)</small>"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/debian.pt.po b/wiki/src/install/debian.pt.po
index 706d00f..8bf7478 100644
--- a/wiki/src/install/debian.pt.po
+++ b/wiki/src/install/debian.pt.po
@@ -55,7 +55,7 @@ msgid "You need:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
diff --git a/wiki/src/install/debian/usb.de.po b/wiki/src/install/debian/usb.de.po
index ce509bb..19e5236 100644
--- a/wiki/src/install/debian/usb.de.po
+++ b/wiki/src/install/debian/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-07-31 17:29+0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2016-02-14 21:18+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -470,8 +470,9 @@ msgstr ""
"nachdem `tails-installer` installiert wurde"
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/debian/usb.fa.po b/wiki/src/install/debian/usb.fa.po
index a1d8abc..2bd8f45 100644
--- a/wiki/src/install/debian/usb.fa.po
+++ b/wiki/src/install/debian/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-31 17:29+0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -352,7 +352,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/debian/usb.fr.po b/wiki/src/install/debian/usb.fr.po
index e596895..4e54db5 100644
--- a/wiki/src/install/debian/usb.fr.po
+++ b/wiki/src/install/debian/usb.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-07-31 17:29+0000\n"
-"PO-Revision-Date: 2017-06-05 13:43-0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"PO-Revision-Date: 2017-09-05 21:16+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -205,9 +205,7 @@ msgstr "<span class=\"guilabel\">Catégorie(s)</span> : *main*"
#. type: Bullet: '1. '
msgid "Click the <span class=\"button\">Add Source</span> button."
-msgstr ""
-"Cliquez sur le bouton <span class=\"button\">Ajouter une source de mise à "
-"jour</span>."
+msgstr "Cliquez sur le bouton <span class=\"button\">Ajouter la source</span>."
#. type: Bullet: '1. '
msgid ""
@@ -287,53 +285,38 @@ msgid "If you are running Ubuntu\n"
msgstr "Si vous utilisez Ubuntu\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid "Start <span class=\"application\">Software Manager</span>."
msgid "Start <span class=\"application\">Software & Updates</span>."
-msgstr ""
-"Démarrez le <span class=\"application\">Gestionnaire de logiciels</span>."
+msgstr "Démarrez <span class=\"application\">Logiciels & mises à jour</span>."
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| " Open the <span class=\"guilabel\">Other Software</span> tab, and "
-#| "click on\n"
-#| " the <span class=\"button\">Add&hellip;</span> button.\n"
msgid ""
"Open the <span class=\"guilabel\">Other Software</span> tab, and click on "
"the <span class=\"button\">Add&hellip;</span> button."
msgstr ""
-" Ouvrez l'onglet <span class=\"guilabel\">Other Software</span>, et "
-"cliquez sur\n"
-" le bouton <span class=\"button\">Ajouter&hellip;</span>.\n"
+"Ouvrez l'onglet <span class=\"guilabel\">Autres logiciels</span> et cliquez "
+"sur le bouton <span class=\"button\">Ajouter&hellip;</span>."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n"
+#, no-wrap
msgid ""
" In the <span class=\"guilabel\">APT line</span> field, specify:\n"
" `ppa:tails-team/tails-installer`\n"
-msgstr " Dans le champ <span class=\"guilabel\">Ligne APT</span>, spécifiez :\n"
+msgstr ""
+" Dans le champ <span class=\"guilabel\">Ligne APT</span>, spécifiez :\n"
+" `ppa:tails-team/tails-installer`\n"
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid "Click the <span class=\"button\">Add Source</span> button."
msgid "Click <span class=\"button\">Close</span>."
-msgstr ""
-"Cliquez sur le bouton <span class=\"button\">Ajouter une source de mise à "
-"jour</span>."
+msgstr "Cliquez sur <span class=\"button\">Fermer</span>."
#. type: Bullet: '1. '
-#, fuzzy
-#| msgid ""
-#| "Execute the following command to install the <span class=\"code\">tails-"
-#| "installer</span> package:"
msgid ""
"Open <span class=\"application\">Terminal</span> and execute the following "
"command to install the <span class=\"code\">tails-installer</span> package:"
msgstr ""
-"Exécutez la commande suivante pour installer le paquet <span class=\"code"
-"\">tails-installer</span> :"
+"Ouvrez <span class=\"application\">Terminal</span> et exécutez la commande "
+"suivante pour installer le paquet <span class=\"code\">tails-installer</"
+"span> :"
#. type: Plain text
#, no-wrap
@@ -437,8 +420,9 @@ msgstr ""
"span>."
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/debian/usb.it.po b/wiki/src/install/debian/usb.it.po
index 71d6a75..2586082 100644
--- a/wiki/src/install/debian/usb.it.po
+++ b/wiki/src/install/debian/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-31 17:29+0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -395,8 +395,9 @@ msgid ""
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
@@ -467,8 +468,10 @@ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"ye
#~ " do so you can either:</p>\n"
#~ msgstr ""
#~ " <div class=\"bug\">\n"
-#~ " <p>Se non viene trovato nessun pacchetto chiamato 'tails-installer', potresti dover\n"
-#~ " aggiornare la cache dell'<span class=\"application\">Ubuntu Software Center</span>. Per\n"
+#~ " <p>Se non viene trovato nessun pacchetto chiamato 'tails-installer', "
+#~ "potresti dover\n"
+#~ " aggiornare la cache dell'<span class=\"application\">Ubuntu Software "
+#~ "Center</span>. Per\n"
#~ " farlo puoi:</p>\n"
#~ msgid ""
@@ -481,7 +484,8 @@ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"ye
#~ " </div>\n"
#~ msgstr ""
#~ " <ul>\n"
-#~ " <li>Esegui <span class=\"command\">sudo update-apt-xapian-index</span>\n"
+#~ " <li>Esegui <span class=\"command\">sudo update-apt-xapian-index</"
+#~ "span>\n"
#~ " in un terminale.</span></li>\n"
#~ " <li>Riavvia Ubuntu.</li>\n"
#~ " </ul>\n"
diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn
index df88acf..23ac0f7 100644
--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -154,7 +154,7 @@ If you are running Linux Mint
1. After <span class="application">Tails Installer</span> is installed,
close <span class="application">Software Manager</span>.
-[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/install_final_in_debian.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/debian/usb.pt.po b/wiki/src/install/debian/usb.pt.po
index a1d8abc..2bd8f45 100644
--- a/wiki/src/install/debian/usb.pt.po
+++ b/wiki/src/install/debian/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-31 17:29+0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -352,7 +352,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download/openpgp.de.po b/wiki/src/install/download/openpgp.de.po
index 7582ac9..412daf0 100644
--- a/wiki/src/install/download/openpgp.de.po
+++ b/wiki/src/install/download/openpgp.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-08-01 19:01+0300\n"
+"POT-Creation-Date: 2017-09-12 17:31+0300\n"
"PO-Revision-Date: 2017-02-09 19:16+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: DE <LL@li.org>\n"
@@ -52,11 +52,18 @@ msgstr ""
"\"yes\" sort=\"age\"]]</span>)."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
msgid ""
"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> of the latest Tails ISO "
-"image and save it to the same folder where you saved the ISO image."
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -112,31 +119,6 @@ msgstr ""
" durch das OpenPGP Web of Trust</a>.</p>\n"
" </div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails [[transitioned to a new signing\n"
-"key|news/signing_key_transition]] in March 2015.\n"
-"If you had the previous signing key, make sure\n"
-"to [[import and verify the new signing\n"
-"key|news/signing_key_transition#index1h1]].</p>\n"
-msgstr ""
-"<p>Tails ist im März 2015 [[zu einem neuen\n"
-"Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
-"Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie sicher,\n"
-"dass Sie den [[neuen Signaturschlüssel importieren und\n"
-"verifizieren|news/signing_key_transition#index1h1]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
#. type: Title =
#, no-wrap
msgid "Verify the ISO image\n"
@@ -190,6 +172,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"windows\"></a>\n"
msgstr "<a id=\"windows\"></a>\n"
@@ -453,6 +440,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr "<div class=\"note\">\n"
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>If you are verifying an ISO image from inside Tails already, for\n"
"example to do a manual upgrade, then the Tails signing key is already\n"
@@ -656,6 +648,19 @@ msgstr ""
"mit Gpg4win"
#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails ist im März 2015 [[zu einem neuen\n"
+#~ "Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
+#~ "Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie sicher,\n"
+#~ "dass Sie den [[neuen Signaturschlüssel importieren und\n"
+#~ "verifizieren|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid ""
#~ "We also acknowledge that not everybody might be able to create good trust "
#~ "path to Tails signing key since it based on a network of direct human "
#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
diff --git a/wiki/src/install/download/openpgp.fa.po b/wiki/src/install/download/openpgp.fa.po
index e927001..5489462 100644
--- a/wiki/src/install/download/openpgp.fa.po
+++ b/wiki/src/install/download/openpgp.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-08-01 19:01+0300\n"
+"POT-Creation-Date: 2017-09-12 17:31+0300\n"
"PO-Revision-Date: 2015-10-06 16:41+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -50,8 +50,8 @@ msgstr ""
msgid ""
"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> of the latest Tails ISO "
-"image and save it to the same folder where you saved the ISO image."
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
#. type: Bullet: '1. '
@@ -88,37 +88,6 @@ msgid ""
" </div>\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>Tails [[transitioned to a new signing\n"
-#| "key|news/signing_key_transition]] between Tails 1.3 (February 24) and\n"
-#| "Tails 1.3.1 (March 31). If you had the previous signing key, make sure\n"
-#| "to [[import and verify the new signing\n"
-#| "key|news/signing_key_transition#index1h1]].</p>\n"
-msgid ""
-"<p>Tails [[transitioned to a new signing\n"
-"key|news/signing_key_transition]] in March 2015.\n"
-"If you had the previous signing key, make sure\n"
-"to [[import and verify the new signing\n"
-"key|news/signing_key_transition#index1h1]].</p>\n"
-msgstr ""
-"<p>تیلز [[به یک کلید امضای جدید منتقل\n"
-"می‌شود|news/signing_key_transition]]. این انتقال بین تیلز ۱٫۳ (۲۴ فوریه)\n"
-"و تیلز ۱٫۳٫۱ (۳۱ مارس) انجام می‌شود. اگر کلید امضای قبلی را داشتید مطمئن شوید که\n"
-"[[کلید امضای جدید را وارد و تأیید\n"
-"می‌کنید|news/signing_key_transition#index1h1]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Verify the ISO image\n"
@@ -164,6 +133,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"windows\"></a>\n"
msgstr ""
@@ -382,6 +356,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>If you are verifying an ISO image from inside Tails already, for\n"
"example to do a manual upgrade, then the Tails signing key is already\n"
@@ -609,6 +588,26 @@ msgstr ""
"[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-compendium_16."
"html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
+#, fuzzy
+#~| msgid ""
+#~| "<p>Tails [[transitioned to a new signing\n"
+#~| "key|news/signing_key_transition]] between Tails 1.3 (February 24) and\n"
+#~| "Tails 1.3.1 (March 31). If you had the previous signing key, make sure\n"
+#~| "to [[import and verify the new signing\n"
+#~| "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>تیلز [[به یک کلید امضای جدید منتقل\n"
+#~ "می‌شود|news/signing_key_transition]]. این انتقال بین تیلز ۱٫۳ (۲۴ فوریه)\n"
+#~ "و تیلز ۱٫۳٫۱ (۳۱ مارس) انجام می‌شود. اگر کلید امضای قبلی را داشتید مطمئن شوید که\n"
+#~ "[[کلید امضای جدید را وارد و تأیید\n"
+#~ "می‌کنید|news/signing_key_transition#index1h1]].</p>\n"
+
#~ msgid "<!-- l10n placeholder for language-specific link -->"
#~ msgstr "<!-- l10n placeholder for language-specific link -->"
diff --git a/wiki/src/install/download/openpgp.fr.po b/wiki/src/install/download/openpgp.fr.po
index 2c1e680..7d19469 100644
--- a/wiki/src/install/download/openpgp.fr.po
+++ b/wiki/src/install/download/openpgp.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-08-01 19:01+0300\n"
-"PO-Revision-Date: 2017-02-09 19:17+0100\n"
+"POT-Creation-Date: 2017-09-12 17:31+0300\n"
+"PO-Revision-Date: 2017-09-14 11:04+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -36,6 +36,9 @@ msgid ""
"If you are not familiar with OpenPGP, download using either [[our Firefox "
"extension or BitTorrent|install/download]] instead."
msgstr ""
+"Si vous n'avez pas l'habitude d'OpenPGP, téléchargez plutôt en utilisant "
+"soit [[notre module complémentaire Firefox soit BitTorrent|install/"
+"download]]."
#. type: Bullet: '1. '
msgid ""
@@ -55,12 +58,13 @@ msgstr ""
msgid ""
"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> of the latest Tails ISO "
-"image and save it to the same folder where you saved the ISO image."
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'>signature OpenPGP</a> de la dernière image ISO de "
-"Tails et sauvegardez-la dans le dossier où vous avez enregistré l'image ISO."
+"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
#. type: Bullet: '1. '
msgid ""
@@ -110,31 +114,6 @@ msgstr ""
" la clé de signature via la Toile de Confiance OpenPGP</a>.</p>\n"
" </div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails [[transitioned to a new signing\n"
-"key|news/signing_key_transition]] in March 2015.\n"
-"If you had the previous signing key, make sure\n"
-"to [[import and verify the new signing\n"
-"key|news/signing_key_transition#index1h1]].</p>\n"
-msgstr ""
-"<p>Tails [[a changé de clé de signature\n"
-"|news/signing_key_transition]] en mars 2015.\n"
-"Si vous aviez l'ancienne clé, n'oubliez-pas\n"
-"d'[[importer et vérifier la nouvelle clé\n"
-"de signature|news/signing_key_transition#index1h1]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
#. type: Title =
#, no-wrap
msgid "Verify the ISO image\n"
@@ -188,6 +167,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"windows\"></a>\n"
msgstr "<a id=\"windows\"></a>\n"
@@ -451,6 +435,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr "<div class=\"note\">\n"
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>If you are verifying an ISO image from inside Tails already, for\n"
"example to do a manual upgrade, then the Tails signing key is already\n"
@@ -644,6 +633,19 @@ msgstr ""
"confiance des clés avec Gpg4win"
#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails [[a changé de clé de signature\n"
+#~ "|news/signing_key_transition]] en mars 2015.\n"
+#~ "Si vous aviez l'ancienne clé, n'oubliez-pas\n"
+#~ "d'[[importer et vérifier la nouvelle clé\n"
+#~ "de signature|news/signing_key_transition#index1h1]].</p>\n"
+
+#~ msgid ""
#~ "We also acknowledge that not everybody might be able to create good trust "
#~ "path to Tails signing key since it based on a network of direct human "
#~ "relationships and the knowledge of quite complex tools such as OpenPGP."
diff --git a/wiki/src/install/download/openpgp.it.po b/wiki/src/install/download/openpgp.it.po
index c0c104e..e3d0434 100644
--- a/wiki/src/install/download/openpgp.it.po
+++ b/wiki/src/install/download/openpgp.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-08-01 19:01+0300\n"
+"POT-Creation-Date: 2017-09-12 17:31+0300\n"
"PO-Revision-Date: 2017-02-09 19:18+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -52,11 +52,18 @@ msgstr ""
"\"age\"]]</span>)."
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
msgid ""
"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> of the latest Tails ISO "
-"image and save it to the same folder where you saved the ISO image."
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -110,31 +117,6 @@ msgstr ""
" la chiave di firma attraverso la Web of Trust di OpenPGP</a>.</p>\n"
" </div>\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails [[transitioned to a new signing\n"
-"key|news/signing_key_transition]] in March 2015.\n"
-"If you had the previous signing key, make sure\n"
-"to [[import and verify the new signing\n"
-"key|news/signing_key_transition#index1h1]].</p>\n"
-msgstr ""
-"<p>Tails [[è passato a una nuova chiave\n"
-"di firma|news/signing_key_transition]] nel marzo 2015.\n"
-"Se avevi la chiave di firma precedente, assicurati\n"
-"di [[importare e verificare la nuova chiave\n"
-"di firma|news/signing_key_transition#index1h1]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
#. type: Title =
#, no-wrap
msgid "Verify the ISO image\n"
@@ -187,6 +169,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"windows\"></a>\n"
msgstr "<a id=\"windows\"></a>\n"
@@ -449,6 +436,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr "<div class=\"note\">\n"
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>If you are verifying an ISO image from inside Tails already, for\n"
"example to do a manual upgrade, then the Tails signing key is already\n"
@@ -636,3 +628,16 @@ msgstr ""
"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
"compendium_16.html]], istruzioni su come gestire la fiducia nelle chiavi con "
"Gpg4win"
+
+#~ msgid ""
+#~ "<p>Tails [[transitioned to a new signing\n"
+#~ "key|news/signing_key_transition]] in March 2015.\n"
+#~ "If you had the previous signing key, make sure\n"
+#~ "to [[import and verify the new signing\n"
+#~ "key|news/signing_key_transition#index1h1]].</p>\n"
+#~ msgstr ""
+#~ "<p>Tails [[è passato a una nuova chiave\n"
+#~ "di firma|news/signing_key_transition]] nel marzo 2015.\n"
+#~ "Se avevi la chiave di firma precedente, assicurati\n"
+#~ "di [[importare e verificare la nuova chiave\n"
+#~ "di firma|news/signing_key_transition#index1h1]].</p>\n"
diff --git a/wiki/src/install/download/openpgp.mdwn b/wiki/src/install/download/openpgp.mdwn
index f5bdeba..e327e61 100644
--- a/wiki/src/install/download/openpgp.mdwn
+++ b/wiki/src/install/download/openpgp.mdwn
@@ -13,7 +13,7 @@ Firefox extension or BitTorrent|install/download]] instead.
1. Download the <a href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>
Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] OpenPGP signature</a>
- of the latest Tails ISO image and save it to the same folder where
+ and save it to the same folder where
you saved the ISO image.
1. If you are doing the verification for the first time, download the
@@ -34,16 +34,6 @@ Firefox extension or BitTorrent|install/download]] instead.
the signing key through the OpenPGP Web of Trust</a>.</p>
</div>
-<div class="note">
-
-<p>Tails [[transitioned to a new signing
-key|news/signing_key_transition]] in March 2015.
-If you had the previous signing key, make sure
-to [[import and verify the new signing
-key|news/signing_key_transition#index1h1]].</p>
-
-</div>
-
Verify the ISO image
====================
diff --git a/wiki/src/install/download/openpgp.pt.po b/wiki/src/install/download/openpgp.pt.po
index e8b954d..9c23ff1 100644
--- a/wiki/src/install/download/openpgp.pt.po
+++ b/wiki/src/install/download/openpgp.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-08-01 19:01+0300\n"
+"POT-Creation-Date: 2017-09-12 17:31+0300\n"
"PO-Revision-Date: 2014-08-06 07:16-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,8 +46,8 @@ msgstr ""
msgid ""
"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> of the latest Tails ISO "
-"image and save it to the same folder where you saved the ISO image."
+"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
+"folder where you saved the ISO image."
msgstr ""
#. type: Bullet: '1. '
@@ -84,26 +84,6 @@ msgid ""
" </div>\n"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails [[transitioned to a new signing\n"
-"key|news/signing_key_transition]] in March 2015.\n"
-"If you had the previous signing key, make sure\n"
-"to [[import and verify the new signing\n"
-"key|news/signing_key_transition#index1h1]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
#. type: Title =
#, no-wrap
msgid "Verify the ISO image\n"
@@ -149,6 +129,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"windows\"></a>\n"
msgstr ""
@@ -367,6 +352,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>If you are verifying an ISO image from inside Tails already, for\n"
"example to do a manual upgrade, then the Tails signing key is already\n"
diff --git a/wiki/src/install/download_2.de.po b/wiki/src/install/download_2.de.po
new file mode 100644
index 0000000..a005205
--- /dev/null
+++ b/wiki/src/install/download_2.de.po
@@ -0,0 +1,29 @@
+# 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: 2017-09-23 21:01+0300\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: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
+"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
+"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
diff --git a/wiki/src/install/download_2.fa.po b/wiki/src/install/download_2.fa.po
new file mode 100644
index 0000000..a005205
--- /dev/null
+++ b/wiki/src/install/download_2.fa.po
@@ -0,0 +1,29 @@
+# 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: 2017-09-23 21:01+0300\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: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
+"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
+"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
diff --git a/wiki/src/install/download_2.fr.po b/wiki/src/install/download_2.fr.po
new file mode 100644
index 0000000..a005205
--- /dev/null
+++ b/wiki/src/install/download_2.fr.po
@@ -0,0 +1,29 @@
+# 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: 2017-09-23 21:01+0300\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: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
+"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
+"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
diff --git a/wiki/src/install/download_2.html b/wiki/src/install/download_2.html
new file mode 100644
index 0000000..40b6b35
--- /dev/null
+++ b/wiki/src/install/download_2.html
@@ -0,0 +1,10 @@
+[[!meta title="Download and verify"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/download_2.it.po b/wiki/src/install/download_2.it.po
new file mode 100644
index 0000000..a005205
--- /dev/null
+++ b/wiki/src/install/download_2.it.po
@@ -0,0 +1,29 @@
+# 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: 2017-09-23 21:01+0300\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: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
+"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
+"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
diff --git a/wiki/src/install/download_2.pt.po b/wiki/src/install/download_2.pt.po
new file mode 100644
index 0000000..a005205
--- /dev/null
+++ b/wiki/src/install/download_2.pt.po
@@ -0,0 +1,29 @@
+# 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: 2017-09-23 21:01+0300\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: Content of: outside any tag (error?)
+msgid ""
+"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
+"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!inline pages="
+"\"install/inc/steps/download_2.inline\" raw=\"yes\" sort=\"age\"]]"
+msgstr ""
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index 0ac34db..34dbaca 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -432,8 +432,9 @@ msgid " sudo apt install tails-installer\n"
msgstr " sudo apt install tails-installer\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index 3ba2e8d..c3eb3d1 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -360,7 +360,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index 8b7ce50..d95353c 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -420,8 +420,9 @@ msgid " sudo apt install tails-installer\n"
msgstr " sudo apt install tails-installer\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index 5467a33..e09d2b9 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: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -414,8 +414,9 @@ msgid " sudo apt install tails-installer\n"
msgstr " sudo apt install tails-installer\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\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_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index 19086e6..8ef1ef3 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -154,7 +154,7 @@ Installer</span>, a program designed specifically for installing Tails.
sudo apt install tails-installer
-[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/install_final_in_debian.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index 3ba2e8d..c3eb3d1 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -360,7 +360,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"install/inc/steps/install_final_in_debian.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/infography/plug-other-usb.png b/wiki/src/install/inc/infography/plug-other-usb.png
deleted file mode 100644
index b678239..0000000
--- a/wiki/src/install/inc/infography/plug-other-usb.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/js/dave_2.js b/wiki/src/install/inc/js/dave_2.js
new file mode 100644
index 0000000..efc8373
--- /dev/null
+++ b/wiki/src/install/inc/js/dave_2.js
@@ -0,0 +1,192 @@
+document.addEventListener('DOMContentLoaded', function() {
+
+ function showFloatingToggleableLinks() {
+ var links = document.getElementsByClassName('floating-toggleable-link');
+ for (let i = 0; i < links.length; i++) {
+ links[i].style.display = 'block';
+ }
+ }
+ showFloatingToggleableLinks();
+
+ function opaque(elm) {
+ elm.style.opacity = '1.0';
+ var siblings = elm.querySelectorAll('a');
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = 'auto';
+ }
+ }
+
+ function transparent(elm) {
+ elm.style.opacity = '0.3';
+ var siblings = elm.querySelectorAll('a');
+ for (let i = 0; i < siblings.length; i++) {
+ siblings[i].style.pointerEvents = 'none';
+ }
+ }
+
+ function toggleOpacity(elm, mode) {
+ for(var i = 0; i < elm.length; i++) {
+ if(mode == 'opaque') {
+ opaque(elm[i]);
+ } else {
+ transparent(elm[i]);
+ }
+ }
+ }
+
+ function hide(elm) {
+ elm.style.display = 'none';
+ }
+
+ function show(elm) {
+ elm.style.display = 'initial';
+ if(elm.classList.contains('block')) {
+ elm.style.display = 'block';
+ }
+ if(elm.classList.contains('inline-block')) {
+ elm.style.display = 'inline-block';
+ }
+ }
+
+ function toggleDisplay(elm, mode) {
+ for(var i = 0; i < elm.length; i++) {
+ if(mode == 'hide') {
+ hide(elm[i]);
+ } else {
+ show(elm[i]);
+ }
+ }
+ }
+
+ function detectBrowser() {
+ // XXX: This should be set by the browser detection script
+ var vendor = 'firefox';
+ if(vendor == 'firefox') {
+ showVersionForSupportedBrowser();
+ toggleDisplay(document.getElementsByClassName('chrome'), 'hide');
+ toggleDisplay(document.getElementsByClassName('firefox'), 'show');
+ }
+ if(vendor == 'chrome') {
+ showVersionForSupportedBrowser();
+ toggleDisplay(document.getElementsByClassName('firefox'), 'hide');
+ toggleDisplay(document.getElementsByClassName('chrome'), 'show');
+ }
+ }
+
+ function showVersionForSupportedBrowser() {
+ toggleDisplay(document.getElementsByClassName('no-js'), 'hide');
+ toggleDisplay(document.getElementsByClassName('supported-browser'), 'show');
+ toggleDirectBitTorrent('direct');
+ }
+
+ function toggleContinueLink(method, state) {
+ if(method == 'direct') {
+ hide(document.getElementById('skip-download-direct'));
+ hide(document.getElementById('skip-verification-direct'));
+ hide(document.getElementById('next-direct'));
+ show(document.getElementById(state));
+ }
+ if(method == 'bittorrent') {
+ hide(document.getElementById('skip-download-bittorrent'));
+ hide(document.getElementById('next-bittorrent'));
+ show(document.getElementById(state));
+ }
+ }
+
+ function showUpdateExtension() {
+ hide(document.getElementById('install-extension'));
+ hide(document.getElementById('extension-installed'));
+ show(document.getElementById('update-extension'));
+ show(document.getElementById('extension-updated'));
+ }
+
+ function resetVerificationResult(result) {
+ hide(document.getElementById('verifying-download'));
+ hide(document.getElementById('verification-successful'));
+ hide(document.getElementById('verification-failed'));
+ hide(document.getElementById('verification-failed-again'));
+ toggleContinueLink('direct', 'skip-verification-direct');
+ }
+
+ function showVerifyingDownload() {
+ hide(document.getElementById('verify-download'));
+ show(document.getElementById('verifying-download'));
+ }
+
+ function showVerificationResult(result) {
+ hide(document.getElementById('verify-download'));
+ resetVerificationResult();
+ if(result == 'successful') {
+ show(document.getElementById('verification-successful'));
+ opaque(document.getElementById('step-continue-direct'));
+ toggleContinueLink('direct', 'next-direct');
+ }
+ if(result == 'failed') {
+ show(document.getElementById('verification-failed'));
+ }
+ if(result == 'failed-again') {
+ show(document.getElementById('verification-failed-again'));
+ }
+ }
+
+ function toggleDirectBitTorrent(method) {
+ transparent(document.getElementById('step-verify-direct'));
+ transparent(document.getElementById('step-continue-direct'));
+ transparent(document.getElementById('continue-link-direct'));
+ transparent(document.getElementById('step-verify-bittorrent'));
+ transparent(document.getElementById('step-continue-bittorrent'));
+ transparent(document.getElementById('continue-link-bittorrent'));
+ if(method == 'direct') {
+ opaque(document.getElementById('step-verify-direct'));
+ opaque(document.getElementById('continue-link-direct'));
+ show(document.getElementById('verify-download'));
+ }
+ if(method == 'bittorrent') {
+ opaque(document.getElementById('step-verify-bittorrent'));
+ opaque(document.getElementById('step-continue-bittorrent'));
+ opaque(document.getElementById('continue-link-bittorrent'));
+ toggleContinueLink('bittorrent', 'next-bittorrent');
+ }
+ }
+
+ detectBrowser();
+ toggleDirectBitTorrent('none');
+ toggleContinueLink('direct', 'skip-download-direct');
+ toggleContinueLink('bittorrent', 'skip-download-bittorrent');
+ opaque(document.getElementById('continue-link-direct'));
+ opaque(document.getElementById('continue-link-bittorrent'));
+
+ // Display "Verify with your browser" when ISO image is clicked
+ document.getElementById('download-iso').onclick = function() {
+ toggleDirectBitTorrent('direct');
+ resetVerificationResult();
+ }
+
+ // Display "Verify with BitTorrent" when Torrent file is clicked
+ document.getElementById('download-torrent').onclick = function() {
+ toggleDirectBitTorrent('bittorrent');
+ }
+
+ // Display "Update extension" instead of "Install extension"
+ // XXX: This should be done by the extension instead
+ showUpdateExtension();
+
+ // Display "Verify download" when "Install extension" or "Update extension" is clicked
+ // XXX: This should be done by the extension instead
+ var buttons = document.getElementsByClassName('install-extension-btn');
+ for (let i = 0; i < buttons.length; i++) {
+ buttons[i].addEventListener('click', function() {
+ hide(document.getElementById('install-extension'));
+ hide(document.getElementById('update-extension'));
+ show(document.getElementById('verification'));
+ });
+ }
+
+ // Display "Verification successful" when "Verify download" is clicked
+ // XXX: This should be done by the extension instead
+ document.getElementById('verify-download').onclick = function() {
+ showVerifyingDownload();
+ setTimeout(function(){showVerificationResult('successful')}, 1500);
+ }
+
+});
diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index df63dc5..2b11442 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -55,8 +55,8 @@ msgid "2 USB sticks"
msgstr "2 USB-Sticks"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>4 GB minimum</small>"
-msgstr "<small>mindestens 4 GB</small>"
+msgid "<small>8 GB minimum</small>"
+msgstr "<small>mindestens 8 GB</small>"
#. type: Content of: <div><div><div><div><div><h4><small>
#, fuzzy
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index b0722c3..7e24c4b 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -49,7 +49,7 @@ msgid "2 USB sticks"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>4 GB minimum</small>"
+msgid "<small>8 GB minimum</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><small>
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index f93d219..866065f 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -49,8 +49,8 @@ msgid "2 USB sticks"
msgstr "2 clés USB"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>4 GB minimum</small>"
-msgstr "<small>d'au moins 4 Go</small>"
+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!"
diff --git a/wiki/src/install/inc/overview.html b/wiki/src/install/inc/overview.html
index 88f4d13..f4165b7 100644
--- a/wiki/src/install/inc/overview.html
+++ b/wiki/src/install/inc/overview.html
@@ -25,7 +25,7 @@
[[!img install/inc/icons/2-usb.png link="no" alt=""]]
<div class="caption">
<h4>2 USB sticks<br />
- <small>4 GB minimum</small><br />
+ <small>8 GB minimum</small><br />
<small>All data will be lost!<br />
[[!toggle id="why_two" text="Why 2?"]]</small>
@@ -43,7 +43,7 @@
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
<h4>1 USB stick<br />
- <small>4 GB minimum</small><br />
+ <small>8 GB minimum</small><br />
<small>All data will be lost!</small>
</h4>
</div>
@@ -54,7 +54,7 @@
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
<h4>1 USB stick<br />
- <small>4 GB minimum</small><br />
+ <small>8 GB minimum</small><br />
<small>All data will be lost!<br />
[[!toggle id="why_extra" text="Why?"]]</small>
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index 314950e..8ea1c52 100644
--- a/wiki/src/install/inc/overview.it.po
+++ b/wiki/src/install/inc/overview.it.po
@@ -54,8 +54,8 @@ msgid "2 USB sticks"
msgstr "2 chiavette USB"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>4 GB minimum</small>"
-msgstr "<small>4 GB almeno di spazio di archiviazione</small>"
+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><small>
#, fuzzy
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index 5d57f5e..f75ee03 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -55,8 +55,8 @@ msgid "2 USB sticks"
msgstr "2 memórias USB"
#. type: Content of: <div><div><div><div><div><h4>
-msgid "<small>4 GB minimum</small>"
-msgstr "<small>mínimo de 4 GB</small>"
+msgid "<small>8 GB minimum</small>"
+msgstr "<small>mínimo de 8 GB</small>"
#. type: Content of: <div><div><div><div><div><h4><small>
#, fuzzy
diff --git a/wiki/src/install/inc/router/clone.de.po b/wiki/src/install/inc/router/clone.de.po
index 5dc90ae..c918d1c 100644
--- a/wiki/src/install/inc/router/clone.de.po
+++ b/wiki/src/install/inc/router/clone.de.po
@@ -42,8 +42,8 @@ msgid "1 other Tails <small>(USB stick or DVD)</small>"
msgstr "1 anderes Tails <small>(USB-Stick oder DVD)</small>"
#. type: Content of: <ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 USB-Stick <small>(mindestens 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 USB-Stick <small>(mindestens 8 GB)</small>"
#. type: Content of: <ul><li>
msgid "½ hour to install"
diff --git a/wiki/src/install/inc/router/clone.fa.po b/wiki/src/install/inc/router/clone.fa.po
index 66be12a..fc7fde5 100644
--- a/wiki/src/install/inc/router/clone.fa.po
+++ b/wiki/src/install/inc/router/clone.fa.po
@@ -35,7 +35,7 @@ msgid "1 other Tails <small>(USB stick or DVD)</small>"
msgstr ""
#. type: Content of: <ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
msgstr ""
#. type: Content of: <ul><li>
diff --git a/wiki/src/install/inc/router/clone.fr.po b/wiki/src/install/inc/router/clone.fr.po
index b4bee7b..9b19672 100644
--- a/wiki/src/install/inc/router/clone.fr.po
+++ b/wiki/src/install/inc/router/clone.fr.po
@@ -38,8 +38,8 @@ msgid "1 other Tails <small>(USB stick or DVD)</small>"
msgstr "1 autre Tails <small>(sur une clé USB ou un DVD)</small>"
#. type: Content of: <ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 clé USB <small>(d'au moins 4 Go)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 clé USB <small>(d'au moins 8 Go)</small>"
#. type: Content of: <ul><li>
msgid "½ hour to install"
diff --git a/wiki/src/install/inc/router/clone.html b/wiki/src/install/inc/router/clone.html
index 78f9a3e..3f97b4d 100644
--- a/wiki/src/install/inc/router/clone.html
+++ b/wiki/src/install/inc/router/clone.html
@@ -7,6 +7,6 @@ Tails is up-to-date.</p>
<h4>You need:</h4>
<ul>
<li>1 other Tails <small>(USB stick or DVD)</small></li>
- <li>1 USB stick <small>(at least 4 GB)</small></li>
+ <li>1 USB stick <small>(at least 8 GB)</small></li>
<li>½ hour to install</li>
</ul>
diff --git a/wiki/src/install/inc/router/clone.it.po b/wiki/src/install/inc/router/clone.it.po
index ad072f0..9a4f4c5 100644
--- a/wiki/src/install/inc/router/clone.it.po
+++ b/wiki/src/install/inc/router/clone.it.po
@@ -41,8 +41,8 @@ msgid "1 other Tails <small>(USB stick or DVD)</small>"
msgstr "1 altra Tails <small>(in chiavetta USB o DVD)</small>"
#. type: Content of: <ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 chiavetta USB <small>(di almeno 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 chiavetta USB <small>(di almeno 8 GB)</small>"
#. type: Content of: <ul><li>
msgid "½ hour to install"
diff --git a/wiki/src/install/inc/router/clone.pt.po b/wiki/src/install/inc/router/clone.pt.po
index e5354e2..d556714 100644
--- a/wiki/src/install/inc/router/clone.pt.po
+++ b/wiki/src/install/inc/router/clone.pt.po
@@ -42,8 +42,8 @@ msgid "1 other Tails <small>(USB stick or DVD)</small>"
msgstr "1 outro Tails <small>(USB ou DVD)</small>"
#. type: Content of: <ul><li>
-msgid "1 USB stick <small>(at least 4 GB)</small>"
-msgstr "1 memória USB <small>(mínimo de 4 GB)</small>"
+msgid "1 USB stick <small>(at least 8 GB)</small>"
+msgstr "1 memória USB <small>(mínimo de 8 GB)</small>"
#. type: Content of: <ul><li>
msgid "½ hour to install"
diff --git a/wiki/src/install/inc/screenshots/tails_installer_in_tails.png b/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
index ba95d61..4b505ae 100644
--- a/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
+++ b/wiki/src/install/inc/screenshots/tails_installer_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/tails_installer_upgrade_in_tails.png b/wiki/src/install/inc/screenshots/tails_installer_upgrade_in_tails.png
new file mode 100644
index 0000000..5bb4700
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/tails_installer_upgrade_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/download_2.inline.de.po b/wiki/src/install/inc/steps/download_2.inline.de.po
new file mode 100644
index 0000000..5311839
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.de.po
@@ -0,0 +1,251 @@
+# 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: 2017-09-27 11:54+0300\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: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
+"ISO image (1.2 GB)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<b>For your security, always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
+"\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might lose time if your download is incomplete or broken due to an error "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid "This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if our download mirrors have been "
+"compromised and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if your download is modified on the "
+"fly by an attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
+"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
+"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
+"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
+"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
+"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
+"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
+"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
+"\">Update extension (no restart)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Installed!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Updated!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verifying $FILENAME&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Please <a>try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<a>Why?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">3.</span>Continue installing"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
+"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
+"\">Next</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
+"later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Please update your browser to the latest version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
+"this quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "https://tails.boum.org/install/download/"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "<a>What is BitTorrent?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid ""
+"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
+"3.1 Torrent file</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
+"\" class=\"btn btn-primary\">Next</a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fa.po b/wiki/src/install/inc/steps/download_2.inline.fa.po
new file mode 100644
index 0000000..5311839
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.fa.po
@@ -0,0 +1,251 @@
+# 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: 2017-09-27 11:54+0300\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: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
+"ISO image (1.2 GB)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<b>For your security, always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
+"\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might lose time if your download is incomplete or broken due to an error "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid "This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if our download mirrors have been "
+"compromised and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if your download is modified on the "
+"fly by an attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
+"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
+"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
+"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
+"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
+"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
+"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
+"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
+"\">Update extension (no restart)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Installed!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Updated!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verifying $FILENAME&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Please <a>try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<a>Why?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">3.</span>Continue installing"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
+"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
+"\">Next</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
+"later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Please update your browser to the latest version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
+"this quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "https://tails.boum.org/install/download/"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "<a>What is BitTorrent?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid ""
+"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
+"3.1 Torrent file</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
+"\" class=\"btn btn-primary\">Next</a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fr.po b/wiki/src/install/inc/steps/download_2.inline.fr.po
new file mode 100644
index 0000000..5311839
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.fr.po
@@ -0,0 +1,251 @@
+# 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: 2017-09-27 11:54+0300\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: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
+"ISO image (1.2 GB)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<b>For your security, always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
+"\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might lose time if your download is incomplete or broken due to an error "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid "This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if our download mirrors have been "
+"compromised and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if your download is modified on the "
+"fly by an attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
+"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
+"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
+"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
+"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
+"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
+"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
+"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
+"\">Update extension (no restart)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Installed!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Updated!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verifying $FILENAME&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Please <a>try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<a>Why?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">3.</span>Continue installing"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
+"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
+"\">Next</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
+"later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Please update your browser to the latest version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
+"this quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "https://tails.boum.org/install/download/"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "<a>What is BitTorrent?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid ""
+"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
+"3.1 Torrent file</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
+"\" class=\"btn btn-primary\">Next</a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.html b/wiki/src/install/inc/steps/download_2.inline.html
new file mode 100644
index 0000000..7c16722
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.html
@@ -0,0 +1,116 @@
+<div class="row">
+
+ <div class="col-md-6"> <!-- Direct download -->
+ <h2>Direct download</h2>
+
+ <div class="supported-browser no-js">
+ <h3><span class="step-number">1.</span>Download Tails</h3>
+ <a id="download-iso" class="btn btn-primary indent">Download Tails 3.1 ISO image (1.2 GB)</a>
+
+ <div id="step-verify-direct">
+ <h3><span class="step-number">2.</span>Verify your download using your browser</h3>
+ <div class="caution indent">
+ <p><b>For your security, always verify your download!</b><br/>
+ Our browser extension makes it quick and easy.</p>
+ <p class="floating-toggleable-link">[[!toggle id="why-verify" text="Why?"]]</p>
+
+ <div id="why-verify" class="floating-toggleable">
+ [[!toggleable id="why-verify" text="""
+ [[!toggle id="why-verify" text="X"]]
+ <ul>
+ <li>You might lose time if your download is incomplete or broken due to an error during the download.<br/>
+ This is quite frequent.</li>
+ <li>You might get hacked while using Tails if our download mirrors have been compromised and are serving malicious downloads.<br/>
+ <a href="http://blog.linuxmint.com/?p=2994">This already happened to other operating systems.</a></li>
+ <li>You might get hacked while using Tails if your download is modified on the fly by an attacker on the network.<br/>
+ <a href="https://en.wikipedia.org/wiki/DigiNotar">This is possible for strong adversaries.</a></li>
+ </ul>
+ """]]
+ </div>
+
+ </div>
+ <div id="install-extension" class="indent">
+ <a class="install-extension-btn supported-browser firefox btn btn-primary">Install <u>Tails verification</u> extension (no restart)</a>
+ <a class="install-extension-btn supported-browser chrome btn btn-primary">Install <u>Tails verification</u> extension (no restart)</a>
+ <a class="install-extension-btn no-js btn btn-primary">Install extension for <u>Firefox and Tor Browser</u> (no restart)</a>
+ <a class="install-extension-btn no-js btn btn-primary">Install extension for <u>Chrome and Chromium</u> (no restart)</a>
+ </div>
+ <div id="update-extension" class="indent block">
+ <p>Your extension is an older version.</p>
+ <a class="install-extension-btn firefox btn btn-primary">Update extension (no restart)</a>
+ <a class="install-extension-btn chrome btn btn-primary">Update extension (no restart)</a>
+ </div>
+ <div id="verification" class="indent block">
+ <p id="extension-installed" class="block">Installed!</p>
+ <p id="extension-updated" class="block">Updated!</p>
+ <a id="verify-download" class="btn btn-primary">Verify download&hellip;</a>
+ <p id="verifying-download" class="block">Verifying $FILENAME&hellip;</p>
+ <p id="verification-successful" class="block">Verification successful!</p>
+ <div id="verification-failed">
+ <p><b>Verification failed!</b></p>
+ <p>Please <a>try to download again&hellip;</a></p>
+ <a>Why?</a>
+ </div>
+ <div id="verification-failed-again">
+ <p><b>Verification failed again!</b></p>
+ <p>Please try to download again from a different place or a different computer&hellip;</p>
+ <a>Why?</a>
+ </div>
+ </div>
+ </div>
+
+ <div id="step-continue-direct">
+ <h3><span class="step-number">3.</span>Continue installing</h3>
+ </div>
+ <div id="continue-link-direct" class="indent">
+ <a id="skip-download-direct">Skip download</a>
+ <a id="skip-verification-direct">Skip verification</a>
+ <a id="next-direct" class="btn btn-primary">Next</a>
+ </div>
+ </div> <!-- Supported browser & No JS -->
+
+ <div class="outdated-browser unsupported-browser">
+ <p>You are using <u><b><span id="detected-browser">$DETECTED-BROWSER</span></b></u>.</p>
+ <p>Direct download is only available for:</p>
+ <ul>
+ <li>Firefox <span class="minver-firefox">$MINVER-FIREFOX</span> and later (<a>Download</a>)</li>
+ <li>Chrome and Chromium <span class="minver-chrome">$MINVER-CHROME</span> and later (<a>Download</a>)</li>
+ <li>Tor Browser <span class="minver-tor-browser">$MINVER-TOR-BROWSER</span> and later (<a>Download</a>)</li>
+ </ul>
+ </div>
+ <div class="outdated-browser">
+ <p>Please update your browser to the latest version.</p>
+ </div>
+ <div class="unsupported-browser">
+ <div class="caution">
+ <p><b>For your security, always verify your download!</b><br/>
+ Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes this quick and easy.</p>
+ <p><a>Why?</a></p>
+ </div>
+ <p>Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:</p>
+ <p>https://tails.boum.org/install/download/</p>
+ </div> <!-- Outdated browser -->
+ </div> <!-- Direct download -->
+
+ <div class="col-md-6">
+ <h2>BitTorrent download</h2>
+ <a>What is BitTorrent?</a>
+
+ <h3><span class="step-number">1.</span>Download Tails (Torrent file)</h3>
+ <a id="download-torrent" class="btn btn-primary indent">Download Tails 3.1 Torrent file</a>
+
+ <div id="step-verify-bittorrent">
+ <h3><span class="step-number">2.</span>Verify your download using BitTorrent</h3>
+ <p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
+ </div>
+
+ <div id="step-continue-bittorrent">
+ <h3><span class="step-number">3.</span>Continue installing</h3>
+ </div>
+ <div id="continue-link-bittorrent" class="indent">
+ <a id="skip-download-bittorrent">Skip download</a>
+ <a id="next-bittorrent" class="btn btn-primary">Next</a>
+ </div>
+ </div> <!-- BitTorrent download -->
+
+</div>
diff --git a/wiki/src/install/inc/steps/download_2.inline.it.po b/wiki/src/install/inc/steps/download_2.inline.it.po
new file mode 100644
index 0000000..5311839
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.it.po
@@ -0,0 +1,251 @@
+# 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: 2017-09-27 11:54+0300\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: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
+"ISO image (1.2 GB)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<b>For your security, always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
+"\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might lose time if your download is incomplete or broken due to an error "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid "This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if our download mirrors have been "
+"compromised and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if your download is modified on the "
+"fly by an attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
+"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
+"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
+"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
+"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
+"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
+"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
+"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
+"\">Update extension (no restart)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Installed!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Updated!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verifying $FILENAME&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Please <a>try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<a>Why?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">3.</span>Continue installing"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
+"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
+"\">Next</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
+"later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Please update your browser to the latest version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
+"this quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "https://tails.boum.org/install/download/"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "<a>What is BitTorrent?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid ""
+"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
+"3.1 Torrent file</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
+"\" class=\"btn btn-primary\">Next</a>"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.pt.po b/wiki/src/install/inc/steps/download_2.inline.pt.po
new file mode 100644
index 0000000..5311839
--- /dev/null
+++ b/wiki/src/install/inc/steps/download_2.inline.pt.po
@@ -0,0 +1,251 @@
+# 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: 2017-09-27 11:54+0300\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: Content of: <div><div><h2>
+msgid "Direct download"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"download-iso\" class=\"btn btn-primary indent\">Download Tails 3.1 "
+"ISO image (1.2 GB)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using your browser"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<b>For your security, always verify your download!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid ""
+"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
+"\"X\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might lose time if your download is incomplete or broken due to an error "
+"during the download."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid "This is quite frequent."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if our download mirrors have been "
+"compromised and are serving malicious downloads."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
+"operating systems.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"You might get hacked while using Tails if your download is modified on the "
+"fly by an attacker on the network."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><ul><li>
+msgid ""
+"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
+"strong adversaries.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "\"\"\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn supported-browser firefox btn btn-primary"
+"\">Install <u>Tails verification</u> extension (no restart)</a> <a class="
+"\"install-extension-btn supported-browser chrome btn btn-primary\">Install "
+"<u>Tails verification</u> extension (no restart)</a> <a class=\"install-"
+"extension-btn no-js btn btn-primary\">Install extension for <u>Firefox and "
+"Tor Browser</u> (no restart)</a> <a class=\"install-extension-btn no-js btn "
+"btn-primary\">Install extension for <u>Chrome and Chromium</u> (no restart)</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Your extension is an older version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a class=\"install-extension-btn firefox btn btn-primary\">Update extension "
+"(no restart)</a> <a class=\"install-extension-btn chrome btn btn-primary"
+"\">Update extension (no restart)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Installed!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Updated!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a id=\"verify-download\" class=\"btn btn-primary\">Verify download&hellip;</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verifying $FILENAME&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Verification successful!"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "Please <a>try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid "<a>Why?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid "<b>Verification failed again!</b>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "<span class=\"step-number\">3.</span>Continue installing"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a id=\"skip-download-direct\">Skip download</a> <a id=\"skip-verification-"
+"direct\">Skip verification</a> <a id=\"next-direct\" class=\"btn btn-primary"
+"\">Next</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
+"b></u>."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Direct download is only available for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Firefox <span class=\"minver-firefox\">$MINVER-FIREFOX</span> and later "
+"(<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Chrome and Chromium <span class=\"minver-chrome\">$MINVER-CHROME</span> and "
+"later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"Tor Browser <span class=\"minver-tor-browser\">$MINVER-TOR-BROWSER</span> "
+"and later (<a>Download</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Please update your browser to the latest version."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
+"this quick and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "https://tails.boum.org/install/download/"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+msgid "BitTorrent download"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "<a>What is BitTorrent?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "<span class=\"step-number\">1.</span>Download Tails (Torrent file)"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid ""
+"<a id=\"download-torrent\" class=\"btn btn-primary indent\">Download Tails "
+"3.1 Torrent file</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\">2.</span>Verify your download using BitTorrent"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Your BitTorrent client will automatically verify your download when it is "
+"complete."
+msgstr ""
+
+#. type: Content of: <div><div><div>
+msgid ""
+"<a id=\"skip-download-bittorrent\">Skip download</a> <a id=\"next-bittorrent"
+"\" class=\"btn btn-primary\">Next</a>"
+msgstr ""
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 4010584..3ad98d3 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: 2017-01-24 18:00+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2016-03-05 03:13-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -117,7 +117,7 @@ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]
#. 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 install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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"
#. type: Plain text
@@ -129,7 +129,7 @@ msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
#. type: Bullet: '1. '
@@ -187,7 +187,7 @@ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
@@ -196,26 +196,22 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button windows linux mac install-clone\">Install "
-"by cloning</span> <span class=\"button debian 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 debian expert"
-"\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</span>."
-
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
#. type: Plain text
@@ -250,13 +246,19 @@ msgstr ""
"ISO-Image aus, das Sie zuvor heruntergeladen haben."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Choose\n"
+#| " <span class=\"windows linux mac-usb\">the second</span>\n"
+#| " <span class=\"install-clone mac-clone\">the new</span>\n"
+#| " <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
-" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Wählen Sie\n"
" <span class=\"windows linux mac-usb\">den zweiten</span>\n"
@@ -265,10 +267,16 @@ msgstr ""
" USB-Stick in der Dropdown-Liste <span class=\"guilabel\">Target Device</span> aus.\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To start the <span class=\"debian expert windows linux mac install-clone"
+#| "\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on "
+#| "the <span class=\"button\">Install Tails</span> button."
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
-"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
-"<span class=\"button\">Install Tails</span> button."
+"\">installation, click on the <span class=\"button\">Install</span> button.</"
+"span> <span class=\"upgrade\">upgrade, click on the <span class=\"button"
+"\">Upgrade</span> button.</span>"
msgstr ""
"Klicken Sie auf die Schaltfläche <span class=\"button\">Install Tails</"
"span>, um die <span class=\"debian expert windows linux mac install-clone"
@@ -276,11 +284,6 @@ msgstr ""
"starten."
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"note upgrade\">\n"
-msgstr " <div class=\"note upgrade\">\n"
-
-#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
@@ -288,10 +291,11 @@ msgstr " <div class=\"note upgrade\">\n"
#| " <span class=\"application\">Tails Installer</span> and choose\n"
#| " <span class=\"guilabel\">Clone & Install</span>.</p>\n"
msgid ""
-" <p>If it is impossible to upgrade the USB stick because it was not\n"
-" installed using <span class=\"application\">Tails Installer</span>, restart\n"
-" <span class=\"application\">Tails Installer</span> and choose\n"
-" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>If your Tails USB stick was not installed using\n"
+" <span class=\"application\">Tails Installer</span>, click on the\n"
+" <span class=\"guilabel\">Install</span> button instead.</p>\n"
+" </div>\n"
msgstr ""
" <p>Falls es nicht möglich ist, den USB-Stick zu aktualisieren, weil dieser\n"
" nicht durch den <span class=\"application\">Tails Installer</span> installiert\n"
@@ -368,3 +372,17 @@ msgstr "<p>Sie sind fertig mit der Aktualisierung von Tails. Sie können nun her
#, no-wrap
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Vielen Dank, dass Sie sicher bleiben!</p>\n"
+
+#~ msgid ""
+#~ "Click on the <span class=\"button windows linux mac install-clone"
+#~ "\">Install by cloning</span> <span class=\"button debian 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 debian "
+#~ "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.fa.po b/wiki/src/install/inc/steps/install_final.inline.fa.po
index e287c01..e16dcbc 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: 2017-01-24 18:00+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -92,7 +92,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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 ""
#. type: Plain text
@@ -102,7 +102,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -146,7 +146,7 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
@@ -155,21 +155,19 @@ msgstr ""
msgid " </div>\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button windows linux mac install-clone\">Install "
-"by cloning</span> <span class=\"button debian expert\">Install</span> <span "
-"class=\"button upgrade\">Upgrade by cloning</span> button."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr ""
#. type: Plain text
@@ -205,28 +203,25 @@ msgid ""
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
-" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
#. type: Bullet: '1. '
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
-"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
-"<span class=\"button\">Install Tails</span> button."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"note upgrade\">\n"
+"\">installation, click on the <span class=\"button\">Install</span> button.</"
+"span> <span class=\"upgrade\">upgrade, click on the <span class=\"button"
+"\">Upgrade</span> button.</span>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" <p>If it is impossible to upgrade the USB stick because it was not\n"
-" installed using <span class=\"application\">Tails Installer</span>, restart\n"
-" <span class=\"application\">Tails Installer</span> and choose\n"
-" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>If your Tails USB stick was not installed using\n"
+" <span class=\"application\">Tails Installer</span>, click on the\n"
+" <span class=\"guilabel\">Install</span> button instead.</p>\n"
+" </div>\n"
msgstr ""
#. type: Bullet: '1. '
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 e4002ae..ec28a93 100644
--- a/wiki/src/install/inc/steps/install_final.inline.fr.po
+++ b/wiki/src/install/inc/steps/install_final.inline.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-01-24 18:00+0100\n"
-"PO-Revision-Date: 2017-01-27 00:31-0000\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"PO-Revision-Date: 2017-08-26 14:08+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -111,8 +111,9 @@ msgid "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\" a
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 install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Plain text
@@ -121,8 +122,9 @@ msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-
msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"Clé USB branchée sur la droite\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
#. type: Bullet: '1. '
@@ -176,10 +178,14 @@ msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debia
msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Installeur de Tails\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <div class=\"expert\">\n"
+#| " <pre><code>tails-installer-launcher</code></pre>\n"
+#| " </div>\n"
msgid ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
" <div class=\"expert\">\n"
@@ -191,26 +197,23 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button windows linux mac install-clone\">Install "
-"by cloning</span> <span class=\"button debian 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"
-"\">Installer par clonage</span> <span class=\"button debian expert"
-"\">Installer</span> <span class=\"button upgrade\">Mettre à jour par "
-"clonage</span>."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Installeur de Tails : 'Installation par clonage', 'Mise à jour par clonage', 'Mise à jour à partir d'une ISO'\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Installation', 'Mise à jour'\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
-msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Installation', 'Mise à jour'\"]]\n"
#. type: Plain text
#, no-wrap
@@ -241,13 +244,19 @@ msgstr ""
"span> et choisir l'image ISO que vous avez téléchargé plus tôt.</p>"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Choose\n"
+#| " <span class=\"windows linux mac-usb\">the second</span>\n"
+#| " <span class=\"install-clone mac-clone\">the new</span>\n"
+#| " <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
-" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Choisir\n"
" <span class=\"windows linux mac-usb\">la seconde</span>\n"
@@ -256,27 +265,34 @@ msgstr ""
" clé USB dans la liste déroulante <span class=\"guilabel\">Périphérique cible</span>.\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To start the <span class=\"debian expert windows linux mac install-clone"
+#| "\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on "
+#| "the <span class=\"button\">Install Tails</span> button."
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
-"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
-"<span class=\"button\">Install Tails</span> button."
+"\">installation, click on the <span class=\"button\">Install</span> button.</"
+"span> <span class=\"upgrade\">upgrade, click on the <span class=\"button"
+"\">Upgrade</span> button.</span>"
msgstr ""
"Pour démarrer <span class=\"debian expert windows linux mac install-clone"
"\">l'installation,</span> <span class=\"upgrade\">la mise à jour,</span> "
"cliquer sur le bouton <span class=\"button\">Installer Tails</span>."
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"note upgrade\">\n"
-msgstr " <div class=\"note upgrade\">\n"
-
-#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
+#| " installed using <span class=\"application\">Tails Installer</span>, restart\n"
+#| " <span class=\"application\">Tails Installer</span> and choose\n"
+#| " <span class=\"guilabel\">Install by cloning</span>.</p>\n"
msgid ""
-" <p>If it is impossible to upgrade the USB stick because it was not\n"
-" installed using <span class=\"application\">Tails Installer</span>, restart\n"
-" <span class=\"application\">Tails Installer</span> and choose\n"
-" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>If your Tails USB stick was not installed using\n"
+" <span class=\"application\">Tails Installer</span>, click on the\n"
+" <span class=\"guilabel\">Install</span> button instead.</p>\n"
+" </div>\n"
msgstr ""
" <p>Si il est impossible de mettre à jour la clé USB car elle n'a pas été\n"
" installée avec l'<span class=\"application\">Installeur de Tails</span>, redémarrer\n"
@@ -343,3 +359,17 @@ msgstr "<p>Vous avez fini la mise à jour de Tails. Vous pouvez maintenant étei
#, no-wrap
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Merci de prendre soin de vous !</p>\n"
+
+#~ msgid ""
+#~ "Click on the <span class=\"button windows linux mac install-clone"
+#~ "\">Install by cloning</span> <span class=\"button debian 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 debian expert"
+#~ "\">Installation</span> <span class=\"button upgrade\">Mise à jour par "
+#~ "clonage</span>."
+
+#~ msgid " <div class=\"note upgrade\">\n"
+#~ msgstr " <div class=\"note upgrade\">\n"
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 dc9e1e4..96457fb 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: 2017-01-24 18:00+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -111,7 +111,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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 ""
#. type: Plain text
@@ -121,7 +121,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr ""
#. type: Bullet: '1. '
@@ -178,7 +178,7 @@ msgstr ""
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
@@ -187,24 +187,19 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
-#. type: Bullet: '1. '
-msgid ""
-"Click on the <span class=\"button windows linux mac install-clone\">Install "
-"by cloning</span> <span class=\"button debian expert\">Install</span> <span "
-"class=\"button upgrade\">Upgrade by cloning</span> button."
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr ""
-"Clicca su <span class=\"button windows linux mac install-clone\">Installa "
-"tramite clonazione</span> <span class=\"button debian expert\">Installa</"
-"span> <span class=\"button upgrade\">Aggiorna tramite clonazione</span>."
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr ""
#. type: Plain text
@@ -236,13 +231,19 @@ msgstr ""
"scegli l'immagine ISO che hai scaricato e verificato prima.</p>"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Choose\n"
+#| " <span class=\"windows linux mac-usb\">the second</span>\n"
+#| " <span class=\"install-clone mac-clone\">the new</span>\n"
+#| " <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+#| " USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
" Choose\n"
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
-" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Scegli\n"
" <span class=\"windows linux mac-usb\">la seconda</span>\n"
@@ -251,21 +252,22 @@ msgstr ""
" chiave USB come <span class=\"guilabel\">Target Device</span> drop-down list.\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To start the <span class=\"debian expert windows linux mac install-clone"
+#| "\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on "
+#| "the <span class=\"button\">Install Tails</span> button."
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
-"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
-"<span class=\"button\">Install Tails</span> button."
+"\">installation, click on the <span class=\"button\">Install</span> button.</"
+"span> <span class=\"upgrade\">upgrade, click on the <span class=\"button"
+"\">Upgrade</span> button.</span>"
msgstr ""
"Per avviare <span class=\"debian expert windows linux mac install-clone"
"\">l'installatione,</span> <span class=\"upgrade\">aggiornamento,</span> "
"clicca sul bottone <span class=\"button\">Install Tails</span>."
#. type: Plain text
-#, no-wrap
-msgid " <div class=\"note upgrade\">\n"
-msgstr " <div class=\"note upgrade\">\n"
-
-#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
@@ -273,10 +275,11 @@ msgstr " <div class=\"note upgrade\">\n"
#| " <span class=\"application\">Tails Installer</span> and choose\n"
#| " <span class=\"guilabel\">Clone & Install</span>.</p>\n"
msgid ""
-" <p>If it is impossible to upgrade the USB stick because it was not\n"
-" installed using <span class=\"application\">Tails Installer</span>, restart\n"
-" <span class=\"application\">Tails Installer</span> and choose\n"
-" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>If your Tails USB stick was not installed using\n"
+" <span class=\"application\">Tails Installer</span>, click on the\n"
+" <span class=\"guilabel\">Install</span> button instead.</p>\n"
+" </div>\n"
msgstr ""
" <p>Se non è possibile aggiornare la chiave USB perchè non era stata\n"
"installata usando <span class=\"application\">Tails Installer</span>, riavvia\n"
@@ -344,3 +347,16 @@ msgstr "<p>Hai aggiornato Tails. Ora puoi spegnere e riavviare utilizzando la tu
#, no-wrap
msgid "<p>Thank you for staying safe!</p>\n"
msgstr "<p>Grazie di stare al sicuro con Tails!</p>\n"
+
+#~ msgid ""
+#~ "Click on the <span class=\"button windows linux mac install-clone"
+#~ "\">Install by cloning</span> <span class=\"button debian 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 debian 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.mdwn b/wiki/src/install/inc/steps/install_final.inline.mdwn
index 01e0fe1..4f5f4a5 100644
--- a/wiki/src/install/inc/steps/install_final.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_final.inline.mdwn
@@ -36,9 +36,10 @@
<div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="debian" alt="USB stick plugged on the right"]]
-[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb install-clone mac-clone" alt="Second USB stick plugged on the right"]]
+[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb clone" alt="Second USB stick plugged on the right"]]
[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd" alt="USB stick plugged on the right"]]
-[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails" alt="Second USB stick plugged on the right"]]
+[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-tails" alt="Second USB stick plugged on the right"]]
+
</div>
1. Plug
@@ -65,19 +66,14 @@
[[!img install/inc/icons/tails-installer.png link="no" class="debian" alt="Tails Installer"]]
<div class="expert">
- <pre><code>tails-installer-launcher</code></pre>
+ <pre><code>tails-installer</code></pre>
</div>
</div>
-1. Click on the
- <span class="button windows linux mac install-clone">Install by cloning</span>
- <span class="button debian expert">Install</span>
- <span class="button upgrade">Upgrade by cloning</span>
- button.
-
- [[!img install/inc/screenshots/tails_installer_in_tails.png link="no" class="screenshot windows linux mac upgrade install-clone" alt="Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'"]]
- [[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert" alt="Tails Installer: 'Install', 'Upgrade'"]]
+ [[!img install/inc/screenshots/tails_installer_in_tails.png link="no" class="screenshot windows linux mac install-clone" alt="Tails Installer: 'Clone the current Tails'"]]
+ [[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert" alt="Tails Installer: 'Use a downloaded Tails ISO image'"]]
+ [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link="no" class="screenshot upgrade" alt="Tails Installer: 'Clone the current Tails'"]]
<div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="debian" alt="ISO image installed on USB stick on the right"]]
@@ -92,20 +88,16 @@
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="debian expert mac-dvd upgrade-clone">your</span>
- USB stick in the <span class="guilabel">Target Device</span> drop-down list.
+ USB stick in the <span class="guilabel">Target USB stick</span> drop-down list.
1. To start the
- <span class="debian expert windows linux mac install-clone">installation,</span>
- <span class="upgrade">upgrade,</span>
- click on the <span class="button">Install Tails</span> button.
+ <span class="debian expert windows linux mac install-clone">installation, click on the <span class="button">Install</span> button.</span>
+ <span class="upgrade">upgrade, click on the <span class="button">Upgrade</span> button.</span>
<div class="note upgrade">
-
- <p>If it is impossible to upgrade the USB stick because it was not
- installed using <span class="application">Tails Installer</span>, restart
- <span class="application">Tails Installer</span> and choose
- <span class="guilabel">Install by cloning</span>.</p>
-
+ <p>If your Tails USB stick was not installed using
+ <span class="application">Tails Installer</span>, click on the
+ <span class="guilabel">Install</span> button instead.</p>
</div>
1. Read the warning message in the confirmation dialog. Click
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 ec54916..3eb1b3f 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: 2017-01-24 18:00+0100\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -114,7 +114,7 @@ msgstr "[[!img install/inc/infography/plug-usb.png link=\"no\" class=\"debian\"]
#. 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 install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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"
#. type: Plain text
@@ -126,7 +126,7 @@ msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
-msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
#. type: Bullet: '1. '
@@ -184,7 +184,7 @@ msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
#, no-wrap
msgid ""
" <div class=\"expert\">\n"
-" <pre><code>tails-installer-launcher</code></pre>\n"
+" <pre><code>tails-installer</code></pre>\n"
" </div>\n"
msgstr ""
@@ -193,27 +193,22 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
-#. type: Bullet: '1. '
-#, fuzzy
-msgid ""
-"Click on the <span class=\"button windows linux mac install-clone\">Install "
-"by cloning</span> <span class=\"button debian expert\">Install</span> <span "
-"class=\"button upgrade\">Upgrade by cloning</span> button."
-msgstr ""
-"Clique no botão <span class=\"button windows linux mac install-clone"
-"\">Install by cloning</span> <span class=\"button debian expert\">Install</"
-"span> <span class=\"button upgrade\">Upgrade by cloning</span>."
-
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac install-clone\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
-msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Use a downloaded Tails ISO image'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link=\"no\" class=\"screenshot upgrade\" alt=\"Tails Installer: 'Clone the current Tails'\"]]\n"
msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
#. type: Plain text
@@ -255,7 +250,7 @@ msgid ""
" <span class=\"windows linux mac-usb\">the second</span>\n"
" <span class=\"install-clone mac-clone\">the new</span>\n"
" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
-" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+" USB stick in the <span class=\"guilabel\">Target USB stick</span> drop-down list.\n"
msgstr ""
" Selecione\n"
" <span class=\"windows linux mac-usb\">a segunda</span>\n"
@@ -264,24 +259,25 @@ msgstr ""
" unidade USB na lista <span class=\"guilabel\">Target Device</span>.\n"
#. type: Bullet: '1. '
+#, fuzzy
msgid ""
"To start the <span class=\"debian expert windows linux mac install-clone"
-"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
-"<span class=\"button\">Install Tails</span> button."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <div class=\"note upgrade\">\n"
+"\">installation, click on the <span class=\"button\">Install</span> button.</"
+"span> <span class=\"upgrade\">upgrade, click on the <span class=\"button"
+"\">Upgrade</span> button.</span>"
msgstr ""
+"Clique no botão <span class=\"button windows linux mac install-clone"
+"\">Install by cloning</span> <span class=\"button debian expert\">Install</"
+"span> <span class=\"button upgrade\">Upgrade by cloning</span>."
#. type: Plain text
#, no-wrap
msgid ""
-" <p>If it is impossible to upgrade the USB stick because it was not\n"
-" installed using <span class=\"application\">Tails Installer</span>, restart\n"
-" <span class=\"application\">Tails Installer</span> and choose\n"
-" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+" <div class=\"note upgrade\">\n"
+" <p>If your Tails USB stick was not installed using\n"
+" <span class=\"application\">Tails Installer</span>, click on the\n"
+" <span class=\"guilabel\">Install</span> button instead.</p>\n"
+" </div>\n"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po
new file mode 100644
index 0000000..654f23d
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.de.po
@@ -0,0 +1,370 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"PO-Revision-Date: 2016-03-05 03:13-0000\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+#| "<h1 id=\"install-final\" class=\"windows linux mac\">Install the final Tails</h1>\n"
+#| "<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+#| "<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgid ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgstr ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Tails installieren</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac\">Installieren Sie das endgültige Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Installieren Sie Tails auf einen USB-Stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Aktualisieren Sie Ihr Tails</h1>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In this step, you will install\n"
+" <span class=\"windows linux mac-usb\">the final</span>\n"
+" Tails on a\n"
+" <span class=\"windows linux mac-usb\">second</span>\n"
+" <span class=\"install-clone mac-clone\">new</span>\n"
+" USB stick using\n"
+" <span class=\"application\">Tails Installer</span>.</p>\n"
+msgstr ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In diesem Schritt werden Sie\n"
+" <span class=\"windows linux mac-usb\">das endgültige</span>\n"
+" Tails auf einem\n"
+" <span class=\"windows linux mac-usb\">zweiten</span>\n"
+" <span class=\"install-clone mac-clone\">neuen</span>\n"
+" USB-Stick mit Hilfe des\n"
+" <span class=\"application\">Tails Installers</span> installieren.</p>\n"
+
+#. type: Plain text
+#, 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"
+msgstr ""
+"<p class=\"upgrade\">\n"
+" In diesem Schritt werden Sie Ihr Tails von dem\n"
+" <span class=\"upgrade-clone\">anderen</span>\n"
+" <span class=\"upgrade-tails\">vorübergehenden</span>\n"
+" Tails mit Hilfe des\n"
+" <span class=\"application\">Tails Installers</span><span class=\"upgrade-tails\"> ein letztes Mal</span> aktualisieren.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution debian windows linux mac\">\n"
+msgstr "<div class=\"caution debian windows linux mac\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr "<p>Alle Daten auf diesem USB-Stick werden verloren gehen.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note upgrade\">\n"
+msgstr "<div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>The persistent storage of your Tails USB stick will be preserved.</p>\n"
+msgstr "<p>Der beständige Speicherbereich auf Ihrem USB-Stick mit Tails bleibt erhalten.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p class=\"upgrade-clone\">The persistent storage of the other Tails will not be copied.</p>\n"
+msgstr "<p class=\"upgrade-clone\">Der beständige Speicherbereich des anderen Tails wird nicht kopiert.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"step-image\">\n"
+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"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+
+#. type: Bullet: '1. '
+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=\"debian 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=\"debian expert mac-dvd\">den</span> USB-"
+"Stick an Ihren Computer an."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+msgstr ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"debian expert\">\n"
+msgstr " <div class=\"debian expert\">\n"
+
+#. type: Plain text
+#, no-wrap
+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=\"Tails Installer\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button windows linux mac install-clone\">Install "
+"by cloning</span> <span class=\"button debian 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 debian expert"
+"\">Install</span> <span class=\"button upgrade\">Upgrade by cloning</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"step-image\">\n"
+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"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"<p class=\"debian expert\">Click <span class=\"button\">Browse</span> and "
+"choose the ISO image that you downloaded earlier.</p>"
+msgstr ""
+"Klicken Sie auf <span class=\"button\">Durchsuchen</span> und wählen Sie das "
+"ISO-Image aus, das Sie zuvor heruntergeladen haben."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Choose\n"
+" <span class=\"windows linux mac-usb\">the second</span>\n"
+" <span class=\"install-clone mac-clone\">the new</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+msgstr ""
+" Wählen Sie\n"
+" <span class=\"windows linux mac-usb\">den zweiten</span>\n"
+" <span class=\"install-clone mac-clone\">den neuen</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">Ihren</span>\n"
+" USB-Stick in der Dropdown-Liste <span class=\"guilabel\">Target Device</span> aus.\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"To start the <span class=\"debian expert windows linux mac install-clone"
+"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
+"<span class=\"button\">Install Tails</span> button."
+msgstr ""
+"Klicken Sie auf die Schaltfläche <span class=\"button\">Install Tails</"
+"span>, um die <span class=\"debian expert windows linux mac install-clone"
+"\">Installation</span> <span class=\"upgrade\">Aktualisierung</span> zu "
+"starten."
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"note upgrade\">\n"
+msgstr " <div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
+#| " installed using <span class=\"application\">Tails Installer</span>, restart\n"
+#| " <span class=\"application\">Tails Installer</span> and choose\n"
+#| " <span class=\"guilabel\">Clone & Install</span>.</p>\n"
+msgid ""
+" <p>If it is impossible to upgrade the USB stick because it was not\n"
+" installed using <span class=\"application\">Tails Installer</span>, restart\n"
+" <span class=\"application\">Tails Installer</span> and choose\n"
+" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+msgstr ""
+" <p>Falls es nicht möglich ist, den USB-Stick zu aktualisieren, weil dieser\n"
+" nicht durch den <span class=\"application\">Tails Installer</span> installiert\n"
+" wurde, starten Sie den <span class=\"application\">Tails Installer</span> neu und wählen Sie\n"
+" <span class=\"guilabel\">Clone & Install</span>.</p>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
+msgstr ""
+"Lesen Sie die Warnmeldung im Bestätigungsfenster. Klicken Sie auf <span "
+"class=\"button\">Yes</span>, um sie zu bestätigen."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" The\n"
+" <span class=\"debian expert windows linux mac install-clone\">installation</span>\n"
+" <span class=\"upgrade\">upgrade</span>\n"
+" takes a few minutes.\n"
+msgstr ""
+" Die\n"
+" <span class=\"debian expert windows linux mac install-clone\">Installation</span>\n"
+" <span class=\"upgrade\">Aktualisierung</span>\n"
+" dauert einige Minuten.\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.</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"
+#| " </div>\n"
+msgid ""
+" <div class=\"bug\">\n"
+" <p>The progress bar usually freezes for some time\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"
+
+#. type: Bullet: '1. '
+msgid "Close <span class=\"application\">Tails Installer</span>."
+msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"trophy upgrade\">\n"
+msgstr "<div class=\"trophy upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>\n"
+msgstr "<p>Sie sind fertig mit der Aktualisierung von Tails. Sie können nun herunterfahren und mit Ihrem USB-Stick mit Tails neustarten.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Thank you for staying safe!</p>\n"
+msgstr "<p>Vielen Dank, dass Sie sicher bleiben!</p>\n"
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
new file mode 100644
index 0000000..c81e8f2
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
@@ -0,0 +1,280 @@
+# 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: 2017-09-25 20:19+0200\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: Plain text
+#, no-wrap
+msgid ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In this step, you will install\n"
+" <span class=\"windows linux mac-usb\">the final</span>\n"
+" Tails on a\n"
+" <span class=\"windows linux mac-usb\">second</span>\n"
+" <span class=\"install-clone mac-clone\">new</span>\n"
+" USB stick using\n"
+" <span class=\"application\">Tails Installer</span>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, 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"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution debian windows linux mac\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note upgrade\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>The persistent storage of your Tails USB stick will be preserved.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p class=\"upgrade-clone\">The persistent storage of the other Tails will not be copied.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"step-image\">\n"
+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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+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=\"debian expert mac-dvd\">the</span> USB stick in "
+"the computer."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"debian expert\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button windows linux mac install-clone\">Install "
+"by cloning</span> <span class=\"button debian expert\">Install</span> <span "
+"class=\"button upgrade\">Upgrade by cloning</span> button."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"step-image\">\n"
+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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"<p class=\"debian expert\">Click <span class=\"button\">Browse</span> and "
+"choose the ISO image that you downloaded earlier.</p>"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Choose\n"
+" <span class=\"windows linux mac-usb\">the second</span>\n"
+" <span class=\"install-clone mac-clone\">the new</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"To start the <span class=\"debian expert windows linux mac install-clone"
+"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
+"<span class=\"button\">Install Tails</span> button."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"note upgrade\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If it is impossible to upgrade the USB stick because it was not\n"
+" installed using <span class=\"application\">Tails Installer</span>, restart\n"
+" <span class=\"application\">Tails Installer</span> and choose\n"
+" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" The\n"
+" <span class=\"debian expert windows linux mac install-clone\">installation</span>\n"
+" <span class=\"upgrade\">upgrade</span>\n"
+" takes a few minutes.\n"
+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"
+" </div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Close <span class=\"application\">Tails Installer</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"trophy upgrade\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Thank you for staying safe!</p>\n"
+msgstr ""
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po
new file mode 100644
index 0000000..a39e9ed
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po
@@ -0,0 +1,347 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"PO-Revision-Date: 2017-08-26 14:08+0000\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgstr ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Installer Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Installer le Tails définitif</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Installer Tails sur une clé USB</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Mettre à jour votre Tails</h1>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In this step, you will install\n"
+" <span class=\"windows linux mac-usb\">the final</span>\n"
+" Tails on a\n"
+" <span class=\"windows linux mac-usb\">second</span>\n"
+" <span class=\"install-clone mac-clone\">new</span>\n"
+" USB stick using\n"
+" <span class=\"application\">Tails Installer</span>.</p>\n"
+msgstr ""
+"<p class=\"debian windows linux mac expert\">\n"
+" À cette étape, vous devrez installer\n"
+" <span class=\"windows linux mac-usb\">le dernier</span>\n"
+" Tails sur une\n"
+" <span class=\"windows linux mac-usb\">seconde</span>\n"
+" <span class=\"install-clone mac-clone\">nouvelle</span>\n"
+" clé USB en utilisant\n"
+" l'<span class=\"application\">Installeur de Tails</span>.</p>\n"
+
+#. type: Plain text
+#, 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"
+msgstr ""
+"<p class=\"upgrade\">\n"
+" À cette étape, vous devrez mettre à niveau votre Tails depuis\n"
+" <span class=\"upgrade-clone\">un autre</span>\n"
+" <span class=\"upgrade-tails\">un</span>\n"
+" Tails <span class=\"upgrade-tails\">intermédiaire</span>\n"
+" en utilisant\n"
+" l'<span class=\"application\">Installeur de Tails</span><span class=\"upgrade-tails\"> une dernière fois</span>.\n"
+"</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution debian windows linux mac\">\n"
+msgstr "<div class=\"caution debian windows linux mac\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr "<p>Toutes les données sur cette clé USB seront perdues.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note upgrade\">\n"
+msgstr "<div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>The persistent storage of your Tails USB stick will be preserved.</p>\n"
+msgstr "<p>Le stockage persistant de votre clé USB Tails devrait être préservé.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p class=\"upgrade-clone\">The persistent storage of the other Tails will not be copied.</p>\n"
+msgstr "<p class=\"upgrade-clone\">Le stockage persistant de votre autre Tails ne sera pas copié.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"step-image\">\n"
+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
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-second-usb.png link=\"no\" class=\"windows linux mac-usb install-clone mac-clone\" alt=\"Second USB stick plugged on the right\"]]\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\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"Clé USB branchée sur la droite\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\" alt=\"Seconde clé USB branchée sur la droite\"]]\n"
+
+#. type: Bullet: '1. '
+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=\"debian 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=\"debian expert mac-dvd\">la</span> clé USB "
+"<span class=\"upgrade\">Tails </span>sur l'ordinateur."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+msgstr ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"debian expert\">\n"
+msgstr " <div class=\"debian expert\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
+msgstr " <p>Démarrer l'<span class=\"application\">Installeur de Tails</span>:</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Tails Installer\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\" class=\"debian\" alt=\"Installeur de Tails\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+msgstr ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button windows linux mac install-clone\">Install "
+"by cloning</span> <span class=\"button debian 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 debian expert"
+"\">Installation</span> <span class=\"button upgrade\">Mise à jour par "
+"clonage</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Installeur de Tails : 'Installation par clonage', 'Mise à jour par clonage', 'Mise à jour à partir d'une ISO'\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Installeur de Tails : 'Installation', 'Mise à jour'\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"step-image\">\n"
+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"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installé sur la clé USB sur la droite\"]]\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"<p class=\"debian expert\">Click <span class=\"button\">Browse</span> and "
+"choose the ISO image that you downloaded earlier.</p>"
+msgstr ""
+"<p class=\"debian expert\">Cliquer sur <span class=\"button\">Parcourir</"
+"span> et choisir l'image ISO que vous avez téléchargé plus tôt.</p>"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Choose\n"
+" <span class=\"windows linux mac-usb\">the second</span>\n"
+" <span class=\"install-clone mac-clone\">the new</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+msgstr ""
+" Choisir\n"
+" <span class=\"windows linux mac-usb\">la seconde</span>\n"
+" <span class=\"install-clone mac-clone\">la nouvelle</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">votre</span>\n"
+" clé USB dans la liste déroulante <span class=\"guilabel\">Périphérique cible</span>.\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"To start the <span class=\"debian expert windows linux mac install-clone"
+"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
+"<span class=\"button\">Install Tails</span> button."
+msgstr ""
+"Pour démarrer <span class=\"debian expert windows linux mac install-clone"
+"\">l'installation,</span> <span class=\"upgrade\">la mise à jour,</span> "
+"cliquer sur le bouton <span class=\"button\">Installer Tails</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"note upgrade\">\n"
+msgstr " <div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If it is impossible to upgrade the USB stick because it was not\n"
+" installed using <span class=\"application\">Tails Installer</span>, restart\n"
+" <span class=\"application\">Tails Installer</span> and choose\n"
+" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+msgstr ""
+" <p>Si il est impossible de mettre à jour la clé USB car elle n'a pas été\n"
+" installée avec l'<span class=\"application\">Installeur de Tails</span>, redémarrer\n"
+" l'<span class=\"application\">Installeur de Tails</span> et choisir\n"
+" <span class=\"guilabel\">Installation par clonage</span>.</p>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the confirmation dialog. Click <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 ""
+" The\n"
+" <span class=\"debian expert windows linux mac install-clone\">installation</span>\n"
+" <span class=\"upgrade\">upgrade</span>\n"
+" takes a few minutes.\n"
+msgstr ""
+" <span class=\"debian expert windows linux mac install-clone\">L'installation</span>\n"
+" <span class=\"upgrade\">La mise à jour</span>\n"
+" prend quelques minutes.\n"
+
+#. 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"
+" </div>\n"
+msgstr ""
+" <div class=\"bug\">\n"
+" <p>La barre de progression se fige généralement pendant quelques instants\n"
+" pendant la synchronisation des données sur le disque.</p>\n"
+" </div>\n"
+
+#. type: Bullet: '1. '
+msgid "Close <span class=\"application\">Tails Installer</span>."
+msgstr "Fermer l'<span class=\"application\">Installeur de Tails</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"trophy upgrade\">\n"
+msgstr "<div class=\"trophy upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>\n"
+msgstr "<p>Vous avez fini la mise à jour de Tails. Vous pouvez maintenant éteindre et redémarrer sur la clé USB Tails.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Thank you for staying safe!</p>\n"
+msgstr "<p>Merci de prendre soin de vous !</p>\n"
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
new file mode 100644
index 0000000..a78e4fb
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
@@ -0,0 +1,346 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: transitails 1\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgstr ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Installa Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Installa una Tails finale</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Installa Tails su una chiavetta USB</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Aggiorna la tua Tails</h1>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In this step, you will install\n"
+" <span class=\"windows linux mac-usb\">the final</span>\n"
+" Tails on a\n"
+" <span class=\"windows linux mac-usb\">second</span>\n"
+" <span class=\"install-clone mac-clone\">new</span>\n"
+" USB stick using\n"
+" <span class=\"application\">Tails Installer</span>.</p>\n"
+msgstr ""
+"<p class=\"debian windows linux mac expert\">\n"
+"In questa fase installerai\n"
+" <span class=\"windows linux mac-usb\">l'ultima</span>\n"
+" Tails su una\n"
+" <span class=\"windows linux mac-usb\">seconda</span>\n"
+" <span class=\"install-clone mac-clone\">nuova</span>\n"
+" chiave USB utilizzando\n"
+" <span class=\"application\">l'installatore di Tails</span>.</p>\n"
+
+#. type: Plain text
+#, 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"
+msgstr ""
+"<p class=\"upgrade\">\n"
+"In questa fase, aggiornerai la tua Tails da un'\n"
+" <span class=\"upgrade-clone\">altra</span>\n"
+" <span class=\"upgrade-tails\">intermediaria</span>\n"
+" Tails utilizzando\n"
+" <span class=\"application\">l'installatore di Tails</span><span class=\"upgrade-tails\"> un'altra volta</span>.\n"
+"</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution debian windows linux mac\">\n"
+msgstr "<div class=\"caution debian windows linux mac\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr "<p>Tutti i file presenti sulla chiavetta USB saranno cancellati.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note upgrade\">\n"
+msgstr "<div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>The persistent storage of your Tails USB stick will be preserved.</p>\n"
+msgstr "<p>Lo spazio Persistente sulla tua chiave USB sarà preservato.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p class=\"upgrade-clone\">The persistent storage of the other Tails will not be copied.</p>\n"
+msgstr "<p class=\"upgrade-clone\">Lo spazio d'archiviazione persistente dell'altra Tails non verrà copiato.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"step-image\">\n"
+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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+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=\"debian 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=\"debian expert mac-dvd"
+"\">nel</span> computer."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+msgstr ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" Scegli\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Applicazioni</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
+" </span>\n"
+" per avviare <span class=\"application\">l'installatore di Tailsr</span>.\n"
+" </p></div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"debian expert\">\n"
+msgstr " <div class=\"debian expert\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>Start <span class=\"application\">Tails Installer</span>:</p>\n"
+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=\"Tails Installer\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the <span class=\"button windows linux mac install-clone\">Install "
+"by cloning</span> <span class=\"button debian 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 debian expert\">Installa</"
+"span> <span class=\"button upgrade\">Aggiorna tramite clonazione</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" alt=\"Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"step-image\">\n"
+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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"<p class=\"debian expert\">Click <span class=\"button\">Browse</span> and "
+"choose the ISO image that you downloaded earlier.</p>"
+msgstr ""
+"<p class=\"debian expert\">Clicca <span class=\"button\">Browse</span> e "
+"scegli l'immagine ISO che hai scaricato e verificato prima.</p>"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" Choose\n"
+" <span class=\"windows linux mac-usb\">the second</span>\n"
+" <span class=\"install-clone mac-clone\">the new</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+msgstr ""
+" Scegli\n"
+" <span class=\"windows linux mac-usb\">la seconda</span>\n"
+" <span class=\"install-clone mac-clone\">la nuova</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">la tua</span>\n"
+" chiave USB come <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"To start the <span class=\"debian expert windows linux mac install-clone"
+"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
+"<span class=\"button\">Install Tails</span> button."
+msgstr ""
+"Per avviare <span class=\"debian expert windows linux mac install-clone"
+"\">l'installatione,</span> <span class=\"upgrade\">aggiornamento,</span> "
+"clicca sul bottone <span class=\"button\">Install Tails</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"note upgrade\">\n"
+msgstr " <div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <p>If it is impossible to upgrade the USB stick because it was not\n"
+#| " installed using <span class=\"application\">Tails Installer</span>, restart\n"
+#| " <span class=\"application\">Tails Installer</span> and choose\n"
+#| " <span class=\"guilabel\">Clone & Install</span>.</p>\n"
+msgid ""
+" <p>If it is impossible to upgrade the USB stick because it was not\n"
+" installed using <span class=\"application\">Tails Installer</span>, restart\n"
+" <span class=\"application\">Tails Installer</span> and choose\n"
+" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+msgstr ""
+" <p>Se non è possibile aggiornare la chiave USB perchè non era stata\n"
+"installata usando <span class=\"application\">Tails Installer</span>, riavvia\n"
+" <span class=\"application\">Tails Installer</span> e scegli\n"
+" <span class=\"guilabel\">Clone & Install</span>.</p>\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
+msgstr ""
+"Leggi il messaggio di avviso nella finestra di conferma. Clicca su <span "
+"class=\"button\">Yes</span> per confermare."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" The\n"
+" <span class=\"debian expert windows linux mac install-clone\">installation</span>\n"
+" <span class=\"upgrade\">upgrade</span>\n"
+" takes a few minutes.\n"
+msgstr ""
+" L'\n"
+" <span class=\"debian expert windows linux mac install-clone\">installazione</span>\n"
+" <span class=\"upgrade\">aggiornamento</span>\n"
+" 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"
+" <p>The progress bar usually freezes for some time\n"
+" while synchronizing data on disk.</p>\n"
+" </div>\n"
+msgstr ""
+" <div class=\"bug\">\n"
+" <p>La barra di avanzamento comunemente rimane bloccata alcuni secondi intorno al 95%\n"
+" mentre sta sincronizzando i dati sul disco, non ti preoccupare.</p>\n"
+" </div>\n"
+
+#. type: Bullet: '1. '
+msgid "Close <span class=\"application\">Tails Installer</span>."
+msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"trophy upgrade\">\n"
+msgstr "<div class=\"trophy upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>\n"
+msgstr "<p>Hai aggiornato Tails. Ora puoi spegnere e riavviare utilizzando la tua Tails che è sulla chiave USB.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Thank you for staying safe!</p>\n"
+msgstr "<p>Grazie di stare al sicuro con Tails!</p>\n"
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn b/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn
new file mode 100644
index 0000000..188d95f
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn
@@ -0,0 +1,136 @@
+<h1 id="install-tails" class="debian expert install-clone mac-clone">Install Tails</h1>
+<h1 id="install-final" class="windows linux mac-usb">Install the final Tails</h1>
+<h1 id="install-usb" class="mac-dvd">Install Tails on a USB stick</h1>
+<h1 id="upgrade" class="upgrade">Upgrade your Tails</h1>
+
+<p class="debian windows linux mac expert">
+ In this step, you will install
+ <span class="windows linux mac-usb">the final</span>
+ Tails on a
+ <span class="windows linux mac-usb">second</span>
+ <span class="install-clone mac-clone">new</span>
+ USB stick using
+ <span class="application">Tails Installer</span>.</p>
+
+<p class="upgrade">
+ In this step, you will upgrade your Tails from the
+ <span class="upgrade-clone">other</span>
+ <span class="upgrade-tails">intermediary</span>
+ Tails using
+ <span class="application">Tails Installer</span><span class="upgrade-tails"> one last time</span>.
+</p>
+
+<div class="caution debian windows linux mac">
+
+<p>All the data on this USB stick will be lost.</p>
+
+</div>
+
+<div class="note upgrade">
+
+<p>The persistent storage of your Tails USB stick will be preserved.</p>
+
+<p class="upgrade-clone">The persistent storage of the other Tails will not be copied.</p>
+
+</div>
+
+<div class="step-image">
+[[!img install/inc/infography/plug-usb.png link="no" class="debian" alt="USB stick plugged on the right"]]
+[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb clone" alt="Second USB stick plugged on the right"]]
+[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd" alt="USB stick plugged on the right"]]
+[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-tails" alt="Second USB stick plugged on the right"]]
+
+</div>
+
+1. 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="debian expert mac-dvd">the</span>
+ USB stick in the computer.
+
+1. <div class="windows linux mac upgrade install-clone"><p>
+ Choose
+ <span class="menuchoice">
+ <span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Tails</span>&nbsp;▸
+ <span class="guimenuitem">Tails Installer</span>
+ </span>
+ to start <span class="application">Tails Installer</span>.
+ </p></div>
+
+ <div class="debian expert">
+
+ <p>Start <span class="application">Tails Installer</span>:</p>
+
+ [[!img install/inc/icons/tails-installer.png link="no" class="debian" alt="Tails Installer"]]
+
+ <div class="expert">
+ <pre><code>tails-installer-launcher</code></pre>
+ </div>
+
+ </div>
+
+1. Click on the
+ <span class="button windows linux mac install-clone">Install by cloning</span>
+ <span class="button debian expert">Install</span>
+ <span class="button upgrade">Upgrade by cloning</span>
+ button.
+
+ [[!img install/inc/screenshots/tails_installer_in_tails.png link="no" class="screenshot windows linux mac upgrade install-clone" alt="Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'"]]
+ [[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert" alt="Tails Installer: 'Install', 'Upgrade'"]]
+
+ <div class="step-image">
+ [[!img install/inc/infography/install-tails.png link="no" class="debian" alt="ISO image installed on USB stick on the right"]]
+ [[!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"]]
+ [[!img install/inc/infography/clone-dvd.png link="no" class="mac-dvd" alt="Tails installed on USB stick on the right"]]
+ </div>
+
+1. <p class="debian expert">Click <span class="button">Browse</span>
+ and choose the ISO image that you downloaded earlier.</p>
+
+ Choose
+ <span class="windows linux mac-usb">the second</span>
+ <span class="install-clone mac-clone">the new</span>
+ <span class="debian expert mac-dvd upgrade-clone">your</span>
+ USB stick in the <span class="guilabel">Target Device</span> drop-down list.
+
+1. To start the
+ <span class="debian expert windows linux mac install-clone">installation,</span>
+ <span class="upgrade">upgrade,</span>
+ click on the <span class="button">Install Tails</span> button.
+
+ <div class="note upgrade">
+
+ <p>If it is impossible to upgrade the USB stick because it was not
+ installed using <span class="application">Tails Installer</span>, restart
+ <span class="application">Tails Installer</span> and choose
+ <span class="guilabel">Install by cloning</span>.</p>
+
+ </div>
+
+1. Read the warning message in the confirmation dialog. Click
+ <span class="button">Yes</span> to confirm.
+
+ The
+ <span class="debian expert windows linux mac install-clone">installation</span>
+ <span class="upgrade">upgrade</span>
+ takes a few minutes.
+
+ <span class="debian">At the end of the installation, you are asked
+ for your administration password twice.</span>
+
+ <div class="bug">
+ <p>The progress bar usually freezes for some time
+ while synchronizing data on disk.</p>
+ </div>
+
+1. Close <span class="application">Tails Installer</span>.
+
+<div class="trophy upgrade">
+
+<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>
+
+<p>Thank you for staying safe!</p>
+
+</div>
diff --git a/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po b/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po
new file mode 100644
index 0000000..befb973
--- /dev/null
+++ b/wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po
@@ -0,0 +1,335 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails 2.2.1\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Upgrade your Tails</h1>\n"
+msgstr ""
+"<h1 id=\"install-tails\" class=\"debian expert install-clone mac-clone\">Instale o Tails</h1>\n"
+"<h1 id=\"install-final\" class=\"windows linux mac-usb\">Instale o Tails final</h1>\n"
+"<h1 id=\"install-usb\" class=\"mac-dvd\">Instalar o Tails em uma memória USB</h1>\n"
+"<h1 id=\"upgrade\" class=\"upgrade\">Atualize o Tails</h1>\n"
+
+# Mantive "Tails Installer"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"debian windows linux mac expert\">\n"
+" In this step, you will install\n"
+" <span class=\"windows linux mac-usb\">the final</span>\n"
+" Tails on a\n"
+" <span class=\"windows linux mac-usb\">second</span>\n"
+" <span class=\"install-clone mac-clone\">new</span>\n"
+" USB stick using\n"
+" <span class=\"application\">Tails Installer</span>.</p>\n"
+msgstr ""
+"<p class=\"debian windows linux mac expert\">\n"
+" Nesta etapa, você vai instalar o\n"
+" Tails <span class=\"windows linux mac-usb\">final</span> em uma\n"
+" <span class=\"windows linux mac-usb\">segunda</span>\n"
+" unidade USB\n"
+" <span class=\"install-clone mac-clone\">nova</span>\n"
+" usando o <span class=\"application\">Tails Installer</span>.</p>\n"
+
+# Mantive "Tails Installer"
+#. type: Plain text
+#, 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"
+msgstr ""
+"<p class=\"upgrade\">\n"
+" Nesta etapa, você vai atualizar o Tails a partir do\n"
+" <span class=\"upgrade-clone\">outro</span>\n"
+" Tails\n"
+" <span class=\"upgrade-tails\">intermediário</span> usando o\n"
+" <span class=\"application\">Tails Installer</span><span class=\"upgrade-tails\"> uma última vez</span>.\n"
+"</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution debian windows linux mac\">\n"
+msgstr "<div class=\"caution debian windows linux mac\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>All the data on this USB stick will be lost.</p>\n"
+msgstr "<p>Todos os dados nesta unidade USB serão perdidas.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note upgrade\">\n"
+msgstr "<div class=\"note upgrade\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>The persistent storage of your Tails USB stick will be preserved.</p>\n"
+msgstr "<p>O armazenamento persistente da sua unidade USB do Tails será preservada.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<p class=\"upgrade-clone\">The persistent storage of the other Tails will not be copied.</p>\n"
+msgstr "<p class=\"upgrade-clone\">O armazenamento persistente do outro Tails não será copiado.</p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"step-image\">\n"
+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"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
+msgid "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\" alt=\"USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-tails-usb.png link=\"no\" class=\"mac-dvd\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+msgid "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-tails\" alt=\"Second USB stick plugged on the right\"]]\n"
+msgstr "[[!img install/inc/infography/plug-upgraded-usb.png link=\"no\" class=\"upgrade-clone upgrade-tails\"]]\n"
+
+#. type: Bullet: '1. '
+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=\"debian 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=\"debian expert mac-dvd"
+"\">a</span> unidade USB <span class=\"upgrade\">Tails</span> no computador."
+
+# Mantive "Tails Installer"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+msgstr ""
+"1. <div class=\"windows linux mac upgrade install-clone\"><p>\n"
+" 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"
+" </p></div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"debian expert\">\n"
+msgstr " <div class=\"debian expert\">\n"
+
+#. type: Plain text
+#, no-wrap
+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=\"Tails Installer\"]]\n"
+msgstr " [[!img install/inc/icons/tails-installer.png link=\"no\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"expert\">\n"
+" <pre><code>tails-installer-launcher</code></pre>\n"
+" </div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
+#. type: Bullet: '1. '
+#, fuzzy
+msgid ""
+"Click on the <span class=\"button windows linux mac install-clone\">Install "
+"by cloning</span> <span class=\"button debian expert\">Install</span> <span "
+"class=\"button upgrade\">Upgrade by cloning</span> button."
+msgstr ""
+"Clique no botão <span class=\"button windows linux mac install-clone"
+"\">Install by cloning</span> <span class=\"button debian expert\">Install</"
+"span> <span class=\"button upgrade\">Upgrade by cloning</span>."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_tails.png link=\"no\" class=\"screenshot windows linux mac upgrade install-clone\" 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\" class=\"screenshot windows linux mac upgrade install-clone\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+msgid " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\" alt=\"Tails Installer: 'Install', 'Upgrade'\"]]\n"
+msgstr " [[!img install/inc/screenshots/tails_installer_in_debian.png link=\"no\" class=\"screenshot debian expert\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"step-image\">\n"
+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"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
+msgid " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\" alt=\"Tails installed on USB stick on the right\"]]\n"
+msgstr " [[!img install/inc/infography/clone-dvd.png link=\"no\" class=\"mac-dvd\"]]\n"
+
+#. type: Bullet: '1. '
+#, fuzzy
+msgid ""
+"<p class=\"debian expert\">Click <span class=\"button\">Browse</span> and "
+"choose the ISO image that you downloaded earlier.</p>"
+msgstr ""
+"<p class=\"debian expert\">Clique em <span class=\"button\">Browse</span> e "
+"escolha a imagem ISO que você obteve anteriormente.</p>"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+msgid ""
+" Choose\n"
+" <span class=\"windows linux mac-usb\">the second</span>\n"
+" <span class=\"install-clone mac-clone\">the new</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">your</span>\n"
+" USB stick in the <span class=\"guilabel\">Target Device</span> drop-down list.\n"
+msgstr ""
+" Selecione\n"
+" <span class=\"windows linux mac-usb\">a segunda</span>\n"
+" <span class=\"install-clone mac-clone\">a nova</span>\n"
+" <span class=\"debian expert mac-dvd upgrade-clone\">a</span>\n"
+" unidade USB na lista <span class=\"guilabel\">Target Device</span>.\n"
+
+#. type: Bullet: '1. '
+msgid ""
+"To start the <span class=\"debian expert windows linux mac install-clone"
+"\">installation,</span> <span class=\"upgrade\">upgrade,</span> click on the "
+"<span class=\"button\">Install Tails</span> button."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"note upgrade\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <p>If it is impossible to upgrade the USB stick because it was not\n"
+" installed using <span class=\"application\">Tails Installer</span>, restart\n"
+" <span class=\"application\">Tails Installer</span> and choose\n"
+" <span class=\"guilabel\">Install by cloning</span>.</p>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Read the warning message in the confirmation dialog. Click <span class="
+"\"button\">Yes</span> to confirm."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" The\n"
+" <span class=\"debian expert windows linux mac install-clone\">installation</span>\n"
+" <span class=\"upgrade\">upgrade</span>\n"
+" takes a few minutes.\n"
+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"
+" </div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Close <span class=\"application\">Tails Installer</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"trophy upgrade\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<p>Thank you for staying safe!</p>\n"
+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 6a57dd9..e18981f 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: 2017-07-07 06:06+0300\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2017-02-09 20:59+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -145,14 +145,8 @@ msgstr "<div class=\"step-image\">\n"
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
#| msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"]]\n"
-msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
msgstr "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"]]\n"
#. type: Plain text
@@ -666,6 +660,11 @@ 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"
+#, fuzzy
+#~| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+#~ msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
+#~ msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+
#~ msgid ""
#~ " [[!inline pages=\"install/inc/steps/not_entirely.inline\" raw=\"yes"
#~ "\"]]\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 a86598a..0db2392 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: 2017-07-07 06:06+0300\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -126,12 +126,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
msgstr ""
#. type: Plain text
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 a1dafd7..6cfb485 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: 2017-07-07 06:06+0300\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\n"
"PO-Revision-Date: 2017-06-05 13:30-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -143,13 +143,9 @@ msgid "<div class=\"step-image\">\n"
msgstr "<div class=\"step-image\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Clé USB branchée sur la gauche\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
msgstr "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"Clé USB branchée sur la gauche\"]]\n"
#. type: Plain text
@@ -623,3 +619,6 @@ msgid ""
msgstr ""
"<p class=\"clone mac-dvd\">C'était une première étape importante !\n"
"Maintenant attrapez la <span class=\"clone\">nouvelle</span> clé USB sur laquelle vous voulez installer Tails.</p>\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"
+#~ msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"Clé USB branchée sur la gauche\"]]\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 3683345..f72114a 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: 2017-07-07 06:06+0300\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -155,14 +155,10 @@ msgid "<div class=\"step-image\">\n"
msgstr "<div class=\"step-image\">\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
+msgstr "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\"]]\n"
#. type: Plain text
#, no-wrap
@@ -722,13 +718,6 @@ msgstr ""
#~ "\"upgrade-tails qrcode\" link=\"no\"]]\n"
#~ msgid ""
-#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
-#~ "\"install-clone mac-clone\"]]\n"
-#~ msgstr ""
-#~ "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class="
-#~ "\"install-clone mac-clone\"]]\n"
-
-#~ msgid ""
#~ "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class="
#~ "\"upgrade-clone\"]]\n"
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
index f70aa04..2a86e66 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
@@ -39,8 +39,7 @@ the rest of the instructions afterwards, we recommend you either:
<h1 id="start-tails" class="debian expert">Restart on Tails</h1>
<div class="step-image">
-[[!img install/inc/infography/plug-source-usb.png link="no" class="install-clone mac-clone" alt="USB stick plugged on the left"]]
-[[!img install/inc/infography/plug-other-usb.png link="no" class="upgrade-clone"i alt="USB stick plugged on the left"]]
+[[!img install/inc/infography/plug-source-usb.png link="no" class="clone" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="debian" alt="Computer restarted on USB stick on the right"]]
[[!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"]]
[[!img install/inc/infography/restart-on-dvd.png link="no" class="mac-dvd" alt="Computer restarted on DVD"]]
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 a86598a..0db2392 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
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-07 06:06+0300\n"
+"POT-Creation-Date: 2017-09-25 20:19+0200\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"
@@ -126,12 +126,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"install-clone mac-clone\" alt=\"USB stick plugged on the left\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img install/inc/infography/plug-other-usb.png link=\"no\" class=\"upgrade-clone\"i alt=\"USB stick plugged on the left\"]]\n"
+msgid "[[!img install/inc/infography/plug-source-usb.png link=\"no\" class=\"clone\" alt=\"USB stick plugged on the left\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/stylesheets/dave.css b/wiki/src/install/inc/stylesheets/dave.css
index e2ffcfd..f021eff 100644
--- a/wiki/src/install/inc/stylesheets/dave.css
+++ b/wiki/src/install/inc/stylesheets/dave.css
@@ -484,4 +484,4 @@ html:not([data-phase="verified"]) #downloaded-path {
#download[data-state="failed"] #download-text-failed {
display: none !important;
-} \ No newline at end of file
+}
diff --git a/wiki/src/install/inc/stylesheets/dave_2.css b/wiki/src/install/inc/stylesheets/dave_2.css
new file mode 100644
index 0000000..d557479
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/dave_2.css
@@ -0,0 +1,76 @@
+/* Display No JS version by default */
+.supported-browser,
+.outdated-browser,
+.unsupported-browser {
+ display: none;
+}
+
+.no-js {
+ display: initial;
+}
+
+#skip-verification-direct,
+#verification,
+#update-extension,
+#extension-updated,
+#skip-download-direct,
+#skip-download-bittorrent {
+ display: none;
+}
+
+#content {
+ padding-left: 0 !important;
+}
+
+.btn {
+ color: white !important;
+ background: #0a0;
+ border: none;
+}
+
+span.step-number {
+ display: inline-block;
+ width: 30px;
+}
+
+.indent {
+ margin-left: 30px !important;
+}
+
+/* FLOATING TOGGLEABLE FOR 'WHY?' CONTEXTUAL HELP */
+
+/* Hide toggleable by default so they don't appear when there is no JavaScript. */
+.floating-toggleable-link {
+ display: none;
+}
+
+.floating-toggleable div.toggleable {
+ display: none;
+ background: white !important;
+ border: 1px solid #0A0 !important;
+ -webkit-box-shadow: 5px 5px #0A0;
+ box-shadow: 5px 5px #0A0;
+ padding: 15px 30px !important;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: -5px;
+ position: absolute !important;
+ text-align: left;
+ font-size: 13px;
+ z-index: 1;
+}
+
+/* X for closing the toggle */
+.floating-toggleable a.toggle {
+ border: none !important;
+ cursor: pointer;
+ position: absolute;
+ right: 7px;
+ top: 5px;
+}
+
+/* Custom positioning for specific toggles */
+
+#why-verify div.toggleable {
+ width: 40em;
+}
diff --git a/wiki/src/install/linux.de.po b/wiki/src/install/linux.de.po
index 1a93291..5bce829 100644
--- a/wiki/src/install/linux.de.po
+++ b/wiki/src/install/linux.de.po
@@ -67,11 +67,11 @@ msgstr "Sie brauchen:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 USB-Sticks <small>(mindestens 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Warum zwei?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Warum zwei?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
#. type: Content of: <div><div><ul><li>
msgid ""
@@ -110,5 +110,5 @@ msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm]]"
#~ msgid "</small>"
#~ msgstr "</small>"
-#~ msgid "2 USB sticks <small>(at least 4 GB)</small>"
-#~ msgstr "2 USB Sticks <small>(mindestens 4 GB)</small>"
+#~ msgid "2 USB sticks <small>(at least 8 GB)</small>"
+#~ msgstr "2 USB Sticks <small>(mindestens 8 GB)</small>"
diff --git a/wiki/src/install/linux.fa.po b/wiki/src/install/linux.fa.po
index 64fd758..a4ef4c4 100644
--- a/wiki/src/install/linux.fa.po
+++ b/wiki/src/install/linux.fa.po
@@ -57,7 +57,7 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/linux.fr.po b/wiki/src/install/linux.fr.po
index ab842ec..4b18c6f 100644
--- a/wiki/src/install/linux.fr.po
+++ b/wiki/src/install/linux.fr.po
@@ -58,11 +58,11 @@ msgstr "Vous avez besoin de :"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 clés USB <small>(d'au moins 4 Go)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]] [[!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><ul><li>
msgid ""
diff --git a/wiki/src/install/linux.html b/wiki/src/install/linux.html
index 076bcba..015dd86 100644
--- a/wiki/src/install/linux.html
+++ b/wiki/src/install/linux.html
@@ -31,7 +31,7 @@
<h4>You need:</h4>
<ul>
- <li>2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
+ <li>2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
[[!toggleable id="why_two" text="""
[[!toggle id="why_two" text="X"]]
diff --git a/wiki/src/install/linux.it.po b/wiki/src/install/linux.it.po
index 7f12627..eff7224 100644
--- a/wiki/src/install/linux.it.po
+++ b/wiki/src/install/linux.it.po
@@ -65,11 +65,11 @@ msgstr "Ti serve:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 chiavette USB <small>(minimo 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 chiavette USB <small>(minimo 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/linux.pt.po b/wiki/src/install/linux.pt.po
index 64fd758..a4ef4c4 100644
--- a/wiki/src/install/linux.pt.po
+++ b/wiki/src/install/linux.pt.po
@@ -57,7 +57,7 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/mac/usb.de.po b/wiki/src/install/mac/usb.de.po
index c4f959b..e9e1dc8 100644
--- a/wiki/src/install/mac/usb.de.po
+++ b/wiki/src/install/mac/usb.de.po
@@ -173,8 +173,8 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
msgstr ""
" $ diskutil list\n"
" /dev/disk0\n"
@@ -186,17 +186,17 @@ msgstr ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
#. type: Bullet: ' 1. '
msgid ""
"Take note of the *device name* of your USB stick. In this example, the USB "
-"stick is 4.0 GB and its device name is <span class=\"code\">/dev/disk1</"
+"stick is 8.0 GB and its device name is <span class=\"code\">/dev/disk1</"
"span>. Yours might be different."
msgstr ""
"Notieren Sie ich den *Gerätenamen* Ihres USB-Sticks. In diesem Beispiel ist "
-"der USB-Stick 4.0 GB groß und der Gerätename lautet <span class=\"code\">/"
+"der USB-Stick 8.0 GB groß und der Gerätename lautet <span class=\"code\">/"
"dev/disk1</span>. Ihrer weicht möglicherweise ab."
#. type: Plain text
diff --git a/wiki/src/install/mac/usb.fa.po b/wiki/src/install/mac/usb.fa.po
index 79646bc..188110b 100644
--- a/wiki/src/install/mac/usb.fa.po
+++ b/wiki/src/install/mac/usb.fa.po
@@ -146,14 +146,14 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
msgstr ""
#. type: Bullet: ' 1. '
msgid ""
"Take note of the *device name* of your USB stick. In this example, the USB "
-"stick is 4.0 GB and its device name is <span class=\"code\">/dev/disk1</"
+"stick is 8.0 GB and its device name is <span class=\"code\">/dev/disk1</"
"span>. Yours might be different."
msgstr ""
diff --git a/wiki/src/install/mac/usb.fr.po b/wiki/src/install/mac/usb.fr.po
index 7d97469..7f270d5 100644
--- a/wiki/src/install/mac/usb.fr.po
+++ b/wiki/src/install/mac/usb.fr.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-08-01 19:01+0300\n"
-"PO-Revision-Date: 2016-11-01 12:39-0000\n"
+"PO-Revision-Date: 2017-08-13 11:20+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -96,10 +96,9 @@ msgid "Execute the following command:"
msgstr "Exécuter la commande suivante :"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " diskutil list\n"
+#, no-wrap
msgid " diskutil list\n"
-msgstr " diskutil list\n"
+msgstr " diskutil list\n"
#. type: Plain text
#, no-wrap
@@ -107,16 +106,7 @@ msgid " It returns a list of the storage devices on the system. For example:
msgstr " Elle retourne une liste des périphériques de stockage sur votre système. Par exemple :\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " $ diskutil list\n"
-#| " /dev/disk0\n"
-#| " #: TYPE NAME SIZE IDENTIFIER\n"
-#| " 0: GUID_partition_scheme *500.1 GB disk0\n"
-#| " 1: EFI 209.7 MB disk0s1\n"
-#| " 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
-#| " 3: EFI 134.1 GB disk0s3\n"
-#| " 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
+#, no-wrap
msgid ""
" $ diskutil list\n"
" /dev/disk0\n"
@@ -127,14 +117,14 @@ msgid ""
" 3: EFI 134.1 GB disk0s3\n"
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
msgstr ""
-" $ diskutil list\n"
-" /dev/disk0\n"
-" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: GUID_partition_scheme *500.1 GB disk0\n"
-" 1: EFI 209.7 MB disk0s1\n"
-" 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
-" 3: EFI 134.1 GB disk0s3\n"
-" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
+" $ diskutil list\n"
+" /dev/disk0\n"
+" #: TYPE NAME SIZE IDENTIFIER\n"
+" 0: GUID_partition_scheme *500.1 GB disk0\n"
+" 1: EFI 209.7 MB disk0s1\n"
+" 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
+" 3: EFI 134.1 GB disk0s3\n"
+" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
#. type: Plain text
#, no-wrap
@@ -171,8 +161,8 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
msgstr ""
" $ diskutil list\n"
" /dev/disk0\n"
@@ -184,17 +174,17 @@ msgstr ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
#. type: Bullet: ' 1. '
msgid ""
"Take note of the *device name* of your USB stick. In this example, the USB "
-"stick is 4.0 GB and its device name is <span class=\"code\">/dev/disk1</"
+"stick is 8.0 GB and its device name is <span class=\"code\">/dev/disk1</"
"span>. Yours might be different."
msgstr ""
"Notez le *nom de périphérique* de votre clé USB. Dans cet exemple, la clé "
-"USB a 4.0 GB et son nom de périphérique est <span class=\"code\">/dev/disk1</"
+"USB a 8.0 GB et son nom de périphérique est <span class=\"code\">/dev/disk1</"
"span>. Le nom de la votre peut être différent."
#. type: Plain text
diff --git a/wiki/src/install/mac/usb.it.po b/wiki/src/install/mac/usb.it.po
index 5b762b0..c4a6c41 100644
--- a/wiki/src/install/mac/usb.it.po
+++ b/wiki/src/install/mac/usb.it.po
@@ -172,8 +172,8 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
msgstr ""
" $ diskutil list\n"
" /dev/disk0\n"
@@ -185,17 +185,17 @@ msgstr ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
#. type: Bullet: ' 1. '
msgid ""
"Take note of the *device name* of your USB stick. In this example, the USB "
-"stick is 4.0 GB and its device name is <span class=\"code\">/dev/disk1</"
+"stick is 8.0 GB and its device name is <span class=\"code\">/dev/disk1</"
"span>. Yours might be different."
msgstr ""
"Prendi nota del *nome del dispositivo* della tua chiave USB. In questo "
-"esempio, la chiave USB è di 4.0 GB e il suo nome dispositivo è <span class="
+"esempio, la chiave USB è di 8.0 GB e il suo nome dispositivo è <span class="
"\"code\">/dev/disk1</span>. Per te potranno essere differenti."
#. type: Plain text
diff --git a/wiki/src/install/mac/usb.mdwn b/wiki/src/install/mac/usb.mdwn
index 70b9b62..3645dcd 100644
--- a/wiki/src/install/mac/usb.mdwn
+++ b/wiki/src/install/mac/usb.mdwn
@@ -59,11 +59,11 @@
4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4
/dev/disk1
#: TYPE NAME SIZE IDENTIFIER
- 0: FDisk_partition_scheme *4.0 GB disk1
- 1: Apple_HFS Untitled 1 4.0 GB disk1s1
+ 0: FDisk_partition_scheme *8.0 GB disk1
+ 1: Apple_HFS Untitled 1 8.0 GB disk1s1
1. Take note of the *device name* of your USB stick.
- In this example, the USB stick is 4.0 GB and its device name is <span class="code">/dev/disk1</span>.
+ In this example, the USB stick is 8.0 GB and its device name is <span class="code">/dev/disk1</span>.
Yours might be different.
<div class="caution">
diff --git a/wiki/src/install/mac/usb.pt.po b/wiki/src/install/mac/usb.pt.po
index 79646bc..188110b 100644
--- a/wiki/src/install/mac/usb.pt.po
+++ b/wiki/src/install/mac/usb.pt.po
@@ -146,14 +146,14 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
" /dev/disk1\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
-" 0: FDisk_partition_scheme *4.0 GB disk1\n"
-" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+" 0: FDisk_partition_scheme *8.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 8.0 GB disk1s1\n"
msgstr ""
#. type: Bullet: ' 1. '
msgid ""
"Take note of the *device name* of your USB stick. In this example, the USB "
-"stick is 4.0 GB and its device name is <span class=\"code\">/dev/disk1</"
+"stick is 8.0 GB and its device name is <span class=\"code\">/dev/disk1</"
"span>. Yours might be different."
msgstr ""
diff --git a/wiki/src/install/v1/Tails/amd64/stable/latest.yml b/wiki/src/install/v1/Tails/amd64/stable/latest.yml
index ca8782f..fb2facb 100644
--- a/wiki/src/install/v1/Tails/amd64/stable/latest.yml
+++ b/wiki/src/install/v1/Tails/amd64/stable/latest.yml
@@ -2,8 +2,8 @@
build-target: amd64
channel: stable
product-name: Tails
-version: '3.1'
+version: '3.2'
target-files:
-- sha256: 0ef1c7d880308ee9f98c255b2658b75445cc84622eae2944a342dcc50cea71c7
+- sha256: 6ead2c7ce076458a31082f1f27444ea94542fe8ee007665e927dfb93c9232a01
size: 1209116672
- url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.1/tails-amd64-3.1.iso
+ url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.2/tails-amd64-3.2.iso
diff --git a/wiki/src/install/v1/Tails/i386/stable/latest.yml b/wiki/src/install/v1/Tails/i386/stable/latest.yml
index ca8782f..fb2facb 100644
--- a/wiki/src/install/v1/Tails/i386/stable/latest.yml
+++ b/wiki/src/install/v1/Tails/i386/stable/latest.yml
@@ -2,8 +2,8 @@
build-target: amd64
channel: stable
product-name: Tails
-version: '3.1'
+version: '3.2'
target-files:
-- sha256: 0ef1c7d880308ee9f98c255b2658b75445cc84622eae2944a342dcc50cea71c7
+- sha256: 6ead2c7ce076458a31082f1f27444ea94542fe8ee007665e927dfb93c9232a01
size: 1209116672
- url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.1/tails-amd64-3.1.iso
+ url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.2/tails-amd64-3.2.iso
diff --git a/wiki/src/install/win.de.po b/wiki/src/install/win.de.po
index cc27dd3..b6d7e21 100644
--- a/wiki/src/install/win.de.po
+++ b/wiki/src/install/win.de.po
@@ -62,11 +62,11 @@ msgstr "Sie benötigen:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 USB-Sticks <small>(mindestens 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Warum 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Warum 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/win.fa.po b/wiki/src/install/win.fa.po
index 387005f..0608a77 100644
--- a/wiki/src/install/win.fa.po
+++ b/wiki/src/install/win.fa.po
@@ -56,7 +56,7 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/win.fr.po b/wiki/src/install/win.fr.po
index 7233ce3..a8e4abe 100644
--- a/wiki/src/install/win.fr.po
+++ b/wiki/src/install/win.fr.po
@@ -57,11 +57,11 @@ msgstr "Vous avez besoin de :"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 clés USB <small>(d'au moins 4 Go)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Pourquoi 2 ?\"]] [[!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><ul><li>
msgid ""
diff --git a/wiki/src/install/win.html b/wiki/src/install/win.html
index 83bdb9d..ff0150b 100644
--- a/wiki/src/install/win.html
+++ b/wiki/src/install/win.html
@@ -31,7 +31,7 @@
<h4>You need:</h4>
<ul>
- <li>2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
+ <li>2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
[[!toggleable id="why_two" text="""
[[!toggle id="why_two" text="X"]]
diff --git a/wiki/src/install/win.it.po b/wiki/src/install/win.it.po
index 529fe2e..8847505 100644
--- a/wiki/src/install/win.it.po
+++ b/wiki/src/install/win.it.po
@@ -62,11 +62,11 @@ msgstr "Hai bisogno di:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr "2 chiavi USB <small>(almeno 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+msgstr "2 chiavi USB <small>(almeno 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
#. type: Content of: <div><div><ul><li>
msgid ""
diff --git a/wiki/src/install/win.pt.po b/wiki/src/install/win.pt.po
index 387005f..0608a77 100644
--- a/wiki/src/install/win.pt.po
+++ b/wiki/src/install/win.pt.po
@@ -56,7 +56,7 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 4 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/win/usb.de.po b/wiki/src/install/win/usb.de.po
index b7598ab..3734042 100644
--- a/wiki/src/install/win/usb.de.po
+++ b/wiki/src/install/win/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-02 13:14+0300\n"
+"POT-Creation-Date: 2017-09-23 12:14+0300\n"
"PO-Revision-Date: 2016-03-06 21:23-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -98,7 +98,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
-msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgid " <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
msgstr " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Laden Sie den Universal USB Installer herunter</a>\n"
#. type: Plain text
diff --git a/wiki/src/install/win/usb.fa.po b/wiki/src/install/win/usb.fa.po
index dbfb329..07c23c0 100644
--- a/wiki/src/install/win/usb.fa.po
+++ b/wiki/src/install/win/usb.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-08-02 13:14+0300\n"
+"POT-Creation-Date: 2017-09-23 12:14+0300\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"
@@ -93,7 +93,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgid " <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/win/usb.fr.po b/wiki/src/install/win/usb.fr.po
index 31f469b..e48644d 100644
--- a/wiki/src/install/win/usb.fr.po
+++ b/wiki/src/install/win/usb.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails translators\n"
-"POT-Creation-Date: 2017-08-02 13:14+0300\n"
-"PO-Revision-Date: 2016-11-01 12:53-0000\n"
+"POT-Creation-Date: 2017-09-23 12:14+0300\n"
+"PO-Revision-Date: 2017-08-13 11:22+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -95,9 +95,9 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
-msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
-msgstr " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Télécharger l'Universal USB Installer</a>\n"
+#| msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgid " <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgstr " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Télécharger l'Universal USB Installer</a>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/win/usb.it.po b/wiki/src/install/win/usb.it.po
index 77a69fa..e7de3df 100644
--- a/wiki/src/install/win/usb.it.po
+++ b/wiki/src/install/win/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-08-02 13:14+0300\n"
+"POT-Creation-Date: 2017-09-23 12:14+0300\n"
"PO-Revision-Date: 2016-07-29 15:09+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
-msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgid " <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
msgstr " <a href='https://git-tails.immerda.ch/uui-binary/plain/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
#. type: Plain text
diff --git a/wiki/src/install/win/usb.mdwn b/wiki/src/install/win/usb.mdwn
index c9e51e7..ea16803 100644
--- a/wiki/src/install/win/usb.mdwn
+++ b/wiki/src/install/win/usb.mdwn
@@ -23,7 +23,7 @@
1. Click on the following link to download <span class="application">Universal USB Installer</span>:
- <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>
+ <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>
1. At the Windows security warning, confirm that you want to
run the program.
diff --git a/wiki/src/install/win/usb.pt.po b/wiki/src/install/win/usb.pt.po
index dbfb329..07c23c0 100644
--- a/wiki/src/install/win/usb.pt.po
+++ b/wiki/src/install/win/usb.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-08-02 13:14+0300\n"
+"POT-Creation-Date: 2017-09-23 12:14+0300\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"
@@ -93,7 +93,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <a href='https://git-tails.immerda.ch/uui-binary/plain/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
+msgid " <a href='https://tails.boum.org/uui/Universal-USB-Installer.exe'>Download Universal USB Installer</a>\n"
msgstr ""
#. type: Plain text