summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-08-20 14:19:33 +0000
committersajolida <sajolida@pimienta.org>2018-08-20 14:19:33 +0000
commite1fd968a4729d8749a7ac76864a7130b2e185a64 (patch)
tree82118e4b72ea3a47ec56378240af888c6ddb3e49
parent28230b8a9814351eaf50b25355775a944f0343a4 (diff)
Update PO files
-rw-r--r--wiki/src/install.de.po10
-rw-r--r--wiki/src/install.es.po14
-rw-r--r--wiki/src/install.fa.po10
-rw-r--r--wiki/src/install.fr.po14
-rw-r--r--wiki/src/install.it.po14
-rw-r--r--wiki/src/install.pt.po10
-rw-r--r--wiki/src/install/download.de.po12
-rw-r--r--wiki/src/install/download.es.po16
-rw-r--r--wiki/src/install/download.fa.po6
-rw-r--r--wiki/src/install/download.fr.po12
-rw-r--r--wiki/src/install/download.it.po12
-rw-r--r--wiki/src/install/download.pt.po15
-rw-r--r--wiki/src/install/expert/usb.de.po60
-rw-r--r--wiki/src/install/expert/usb.es.po70
-rw-r--r--wiki/src/install/expert/usb.fa.po24
-rw-r--r--wiki/src/install/expert/usb.fr.po60
-rw-r--r--wiki/src/install/expert/usb.it.po60
-rw-r--r--wiki/src/install/expert/usb.pt.po38
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po222
-rw-r--r--wiki/src/install/inc/steps/download.inline.es.po276
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po138
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po273
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po216
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po138
24 files changed, 1365 insertions, 355 deletions
diff --git a/wiki/src/install.de.po b/wiki/src/install.de.po
index 8aabf80..0c9a80f 100644
--- a/wiki/src/install.de.po
+++ b/wiki/src/install.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:00+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -102,8 +102,12 @@ msgstr "<small>(Red Hat, Fedora, usw.)</small>"
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
#~ msgid "Let's start the journey!"
diff --git a/wiki/src/install.es.po b/wiki/src/install.es.po
index b2e8dfc..a4c4a42 100644
--- a/wiki/src/install.es.po
+++ b/wiki/src/install.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-10 16:12+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-09 19:35+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -91,8 +91,16 @@ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Sólo descargar|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Sólo descargar|install/download]]"
#~ msgid "Let's start the journey!"
diff --git a/wiki/src/install.fa.po b/wiki/src/install.fa.po
index 68aeafa..6b4d556 100644
--- a/wiki/src/install.fa.po
+++ b/wiki/src/install.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,6 +83,10 @@ msgstr ""
msgid "|install/linux]]"
msgstr ""
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
diff --git a/wiki/src/install.fr.po b/wiki/src/install.fr.po
index ba7c8dc..0bab825 100644
--- a/wiki/src/install.fr.po
+++ b/wiki/src/install.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-16 08:35+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -90,8 +90,16 @@ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Seulement télécharger|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Seulement télécharger|install/download]]"
#~ msgid "Let's start the journey!"
diff --git a/wiki/src/install.it.po b/wiki/src/install.it.po
index 66a6c1e..d778dd9 100644
--- a/wiki/src/install.it.po
+++ b/wiki/src/install.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: italian\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-06-30 13:43+0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -101,8 +101,16 @@ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Scarica solamente|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Scarica solamente|install/download]]"
#~ msgid "Let's start the journey!"
diff --git a/wiki/src/install.pt.po b/wiki/src/install.pt.po
index 2c3613c..3fdf9c9 100644
--- a/wiki/src/install.pt.po
+++ b/wiki/src/install.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,6 +84,10 @@ msgstr ""
msgid "|install/linux]]"
msgstr ""
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
diff --git a/wiki/src/install/download.de.po b/wiki/src/install/download.de.po
index 48b7624..6c8eb12 100644
--- a/wiki/src/install/download.de.po
+++ b/wiki/src/install/download.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2016-02-14 23:40+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -17,8 +17,9 @@ msgstr ""
"X-Generator: Poedit 1.8.7\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Herunterladen und Verifizieren\"]]\n"
#. type: Plain text
@@ -49,8 +50,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.es.po b/wiki/src/install/download.es.po
index fedb487..6b537a6 100644
--- a/wiki/src/install/download.es.po
+++ b/wiki/src/install/download.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-26 06:36+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-download/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-download/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,9 @@ msgstr ""
"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Descargar y verificar\"]]\n"
#. type: Plain text
@@ -49,8 +50,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.fa.po b/wiki/src/install/download.fa.po
index f40c7b9..ee86053 100644
--- a/wiki/src/install/download.fa.po
+++ b/wiki/src/install/download.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr ""
#. type: Plain text
@@ -48,7 +48,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download.fr.po b/wiki/src/install/download.fr.po
index c6ad55a..d349770 100644
--- a/wiki/src/install/download.fr.po
+++ b/wiki/src/install/download.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-12-03 20:04+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,8 +17,9 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Télécharger et vérifier\"]]\n"
#. type: Plain text
@@ -47,8 +48,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.it.po b/wiki/src/install/download.it.po
index a38f8ea..1a395d6 100644
--- a/wiki/src/install/download.it.po
+++ b/wiki/src/install/download.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-06-03 18:04+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -18,8 +18,9 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Scarica e verifica\"]]\n"
#. type: Plain text
@@ -50,8 +51,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.pt.po b/wiki/src/install/download.pt.po
index 099b658..e28869f 100644
--- a/wiki/src/install/download.pt.po
+++ b/wiki/src/install/download.pt.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails"
-"/install-download/pt/>\n"
+"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
+"install-download/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr ""
#. type: Plain text
@@ -50,9 +50,10 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index df670cf..11a8528 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -64,10 +64,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Wenn Sie den Signaturschlüssel von Tails schon mit Ihrem eigenen Schlüssel zertifiziert haben,\n"
@@ -80,9 +84,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"In diesem Schritt werden Sie den *Signaturschlüssel von Tails*, welcher der "
"OpenPGP-Schlüssel ist, der für die kryptografische Signierung des ISO-Images "
@@ -295,45 +304,59 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Laden Sie das ISO-Image herunter und verifizieren Sie es</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"In diesem Schritt werden Sie das aktuellste ISO-Image von Tails "
"herunterladen und es mithilfe des Signaturschlüssels von Tails verifizieren."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Laden Sie das ISO-Image herunter:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Laden Sie die Signatur des ISO-Images herunter:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verifizieren Sie, dass das ISO-Image mit dem Signaturschlüssel von Tails "
"signiert wurde:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -342,8 +365,9 @@ msgid " The output of this command should be the following:\n"
msgstr " Die Ausgabe des Befehls sollte folgendermaßen sein:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.es.po b/wiki/src/install/expert/usb.es.po
index 5110bff..032b16d 100644
--- a/wiki/src/install/expert/usb.es.po
+++ b/wiki/src/install/expert/usb.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-expert-usb/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-expert-usb/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,10 +63,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Si ya certificaste la llave de firmado de Tails con tu propia llave, puedes\n"
@@ -79,9 +83,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"En este paso, vas a descargar y verificar la *llave de firmado de Tails** "
"que es la llave OpenPGP que es usada para firmar la imagen ISO de Tails "
@@ -291,44 +300,58 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Descargar y verificar la imagen ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"En este paso, descargarás la última imagen ISO de Tails y la verificarás "
"usando la llave de firmado de Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Descargar la imagen ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Descargar la firma de la imagen ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verificar que la imagen ISO esté firmada por la llave de firmado de Tails:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -337,8 +360,9 @@ msgid " The output of this command should be the following:\n"
msgstr " La salida de este comando debería ser la siguiente:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -389,10 +413,8 @@ msgid ""
" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports main'\n"
" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-backports.list && echo \"OK\"\n"
msgstr ""
-" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports "
-"main'\n"
-" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-"
-"backports.list && echo \"OK\"\n"
+" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-backports.list && echo \"OK\"\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index eb38948..b0262d1 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
@@ -75,7 +75,7 @@ msgstr ""
#. type: Plain text
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
#. type: Plain text
@@ -240,40 +240,40 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr ""
#. type: Plain text
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
@@ -283,7 +283,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index c76eb08..50edc07 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-20 11:21+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -61,10 +61,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Si vous avez déjà certifié la clé de signature Tails avec votre propre clé, vous\n"
@@ -77,9 +81,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"À cette étape, vous allez télécharger et vérifier la *clé de signature de "
"Tails* qui est la clé OpenPGP utilisée pour signer cryptographiquement les "
@@ -286,43 +295,57 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Télécharger et vérifier l'image ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"À cette étape, vous allez télécharger la dernière image ISO de Tails et la "
"vérifier avec la clé de signature de Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Télécharger l'image ISO :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Télécharger la signature de l'image ISO :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr "Vérifier que l'image ISO est signée par la clé de signature de Tails :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -331,8 +354,9 @@ msgid " The output of this command should be the following:\n"
msgstr " La sortie de cette commande devrait être la suivante :\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index 3b865f6..d8bb911 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -61,10 +61,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Se hai già certificato la chiave di firma di Tails con la tua chiave, puoi\n"
@@ -77,9 +81,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"In questo passaggio scaricherai e verificherai la *chiave di firma di "
"Tails*, che è la chiave OpenPGP usata per firmare l'immagine ISO di Tails "
@@ -285,44 +294,58 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Scarica e verifica l'immagine ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"In questo passaggio, scaricherai l'ultima immagine ISO di Tails e la "
"verificherai usando la chiave di firma di Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Scarica l'immagine ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Scarica la firma dell'immagine ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verifica che l'immagine ISO sia firmata con la chiave di firma di Tails:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -331,8 +354,9 @@ msgid " The output of this command should be the following:\n"
msgstr " L'output di questo comanda dovrebbe essere il seguente:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index 819a0f2..6cfacde 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails"
-"/install-expert-usb/pt/>\n"
+"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
+"install-expert-usb/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr "<div class=\"tip\">\n"
#, no-wrap
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
@@ -79,7 +79,7 @@ msgstr "</div>\n"
#. type: Plain text
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
#. type: Plain text
@@ -244,41 +244,43 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr ""
#. type: Plain text
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -287,7 +289,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index efd8795..f467db9 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,34 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, 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 ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"Laden Sie das <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] ISO-Image herunter</a> (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -253,6 +280,24 @@ msgstr ""
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+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\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><div><div><div><p>
+#, 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> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -305,13 +350,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -436,15 +481,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -536,6 +581,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -573,7 +622,7 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -581,10 +630,29 @@ msgstr ""
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+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\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><div>
+#, 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> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
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\" "
@@ -604,11 +672,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -626,11 +705,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr ""
#. type: Content of: <div><ol><li><p>
+#, 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> "
+#| "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> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the 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\" "
@@ -722,8 +811,13 @@ msgstr ""
"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -741,16 +835,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Öffnen Sie den <span class=\"application\">Finder</span> und navigieren Sie "
"zu dem Ordner, in dem Sie das ISO-Image und die Signatur gespeichert haben."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -767,9 +870,13 @@ msgid "In Tails"
msgstr "In Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
"ISO-Image und die Signatur gespeichert haben."
@@ -783,7 +890,9 @@ msgstr ""
"\">Mit Signatur-Datei überprüfen öffnen</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "Die Verifizierung des ISO-Image startet automatisch:"
#. type: Content of: <div><ol><li><p>
@@ -797,7 +906,19 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -809,9 +930,13 @@ msgid "Using the command line"
msgstr "Mithilfe der Kommandozeile"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
"Image und die Signatur gespeichert haben."
@@ -821,8 +946,22 @@ msgid "Execute:"
msgstr "Führen Sie aus:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -831,9 +970,25 @@ msgid "The output of this command should be the following:"
msgstr "Die Ausgabe des Befehls sollte folgende sein:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -940,10 +1095,10 @@ msgstr ""
#| "Tails. You can trust this signing key as much as you are trusting your "
#| "Tails installation already because you are not downloading it."
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum "
"Beispiel wenn Sie eine manuelle Aktualisierung durchführen, ist der "
@@ -1135,6 +1290,11 @@ msgstr ""
"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Verify the date of the signature to make sure that you downloaded the "
#~ "latest version."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.es.po b/wiki/src/install/inc/steps/download.inline.es.po
index 72c48b8..8625d10 100644
--- a/wiki/src/install/inc/steps/download.inline.es.po
+++ b/wiki/src/install/inc/steps/download.inline.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-09 18:54+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -42,7 +42,47 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Descarga Tails"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary "
+#| "inline-block indent\">Download Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
+#| "\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+#| "\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+#| "stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+#| "class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+#| "\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!inline "
+#| "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Descarga la imagen ISO [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] de Tails (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+"stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+"class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+"\">Descarga la imagen ISO [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] de Tails (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a>"
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -284,6 +324,21 @@ msgstr ""
"Descargar otra vez usualmente es suficiente para arreglar este problema."
#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry"
+#| "\">Please try to download again&hellip;</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Por "
+"favor, intenta la descarga nuevamente&hellip;</a>"
+
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
@@ -341,13 +396,20 @@ msgstr ""
"Por favor intenta descargarla de nuevo de un lugar diferente o desde un "
"ordenador diferente&hellip;"
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"debian windows "
@@ -488,6 +550,10 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr "[[Instalar desde macOS con la línea de comandos|install/mac/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgstr "[[Actualizar dentro de Tails|upgrade/tails]]"
+
+#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Burn on a DVD|dvd]]"
msgstr "Grabar un DVD"
@@ -495,10 +561,6 @@ msgstr "Grabar un DVD"
msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr "[[Ejecutar en una máquina virtual|doc/advanced_topics/virtualization]]"
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
-msgstr "[[Actualizar dentro de Tails|upgrade/tails]]"
-
#. type: Content of: <div><div><div><p>
msgid ""
"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
@@ -601,6 +663,12 @@ msgstr "<code>https://tails.boum.org/install/vm-download/</code>"
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr "<code>https://tails.boum.org/install/download/</code>"
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<code>https://tails.boum.org/install/download/</code>"
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr "<code>https://tails.boum.org/install/download/</code>"
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr "Descarga con BitTorrent"
@@ -647,12 +715,36 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Descarga Tails (archivo Torrent)"
-#. type: Content of: <div><div><div>
-msgid ""
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"indent\">Descargar el archivo torrent de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a>"
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
@@ -675,11 +767,39 @@ msgstr ""
"Tu cliente BitTorrent verificará automáticamente la descarga cuando haya "
"terminado."
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"debian windows "
+"linux mac-usb mac-dvd\">instalando</span> <span class=\"upgrade-tails"
+"\">actualizando</span> <span class=\"download-only\">instalando o "
+"actualizando</span>"
+
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Open and download the Torrent file with your BitTorrent client. It "
+#| "contains the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image that you will use in the next step."
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
"Abre y descarga el archivo torrent con tu cliente de torrents favorito (ej. "
"BitTorrent). Contiene la imagen ISO de Tails [[!inline pages=\"inc/"
@@ -704,11 +824,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr "Descarga la [[llave de firma de Tails|tails-signing.key]]."
#. type: Content of: <div><ol><li><p>
-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> and save it to the same "
-"folder where you saved the ISO image."
+#, 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> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Descarga la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> [[!inline pages=\"inc/stable_amd64_version\" raw="
@@ -800,8 +930,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -818,16 +953,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "En macOS usando <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Abre <span class=\"application\">Finder</span> y navega a la carpeta donde "
"guardaste la imagen ISO y la firma."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -844,9 +988,13 @@ msgid "In Tails"
msgstr "En Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Abre el explorador de archivos y navega a la carpeta donde guardaste la "
"imagen ISO y la firma."
@@ -860,7 +1008,9 @@ msgstr ""
"\">Abrir con Verificar la Firma</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La verificación de la imagen ISO comienza automáticamente:"
#. type: Content of: <div><ol><li><p>
@@ -876,8 +1026,20 @@ msgstr ""
"es buena:"
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
-msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
@@ -888,9 +1050,13 @@ msgid "Using the command line"
msgstr "Usando la linea de comandos"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Abre una terminal y navega hacia la carpeta donde guardaste la imagen ISO y "
"la firma."
@@ -900,8 +1066,22 @@ msgid "Execute:"
msgstr "Ejecuta:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -910,9 +1090,25 @@ msgid "The output of this command should be the following:"
msgstr "El output de este comando debería ser el siguiente:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -1010,11 +1206,18 @@ msgstr ""
"Confianza OpenPGP."
#. type: Content of: <div><div><p>
-msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+#, fuzzy
+#| msgid ""
+#| "If you are verifying an ISO image from inside Tails, for example, to do a "
+#| "manual upgrade, then you already have the Tails signing key. You can "
+#| "trust this signing key as much as you already trust your Tails "
+#| "installation since this signing key is included in your Tails "
+#| "installation."
+msgid ""
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Si estás verificando una imagen ISO desde dentro de Tails, por ejemplo para "
"hacer una actualización manual, entonces ya tienes la clave de firma de "
@@ -1115,6 +1318,11 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index 661e856..189d5a8 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,22 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -222,6 +237,13 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -269,13 +291,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -400,15 +422,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -500,6 +522,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -537,12 +563,20 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
#. type: Content of: <div><div><div><h3>
@@ -557,11 +591,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -580,10 +625,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
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> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
#. type: Content of: <div><h3>
@@ -657,7 +706,7 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -673,12 +722,12 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -693,8 +742,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
@@ -704,7 +753,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -718,7 +767,15 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr ""
#. type: Content of: <div>
@@ -731,8 +788,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -741,7 +798,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -750,8 +814,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
-"\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -826,10 +896,10 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
#. type: Content of: <div><p>
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index 2f4991b..b180e96 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-03-29 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -40,7 +40,46 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary "
+#| "inline-block indent\">Download Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
+#| "\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+#| "\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+#| "stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+#| "class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+#| "\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!inline "
+#| "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Télécharger l'image ISO de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] (<span class=\"remove-"
+"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+"\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" "
+"raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-"
+"retry btn btn-primary inline-block indent\">Télécharger l'image ISO de Tails "
+"[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] "
+"(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+"stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -284,6 +323,21 @@ msgstr ""
"Télécharger à nouveau est généralement suffisant pour corriger ce problème."
#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry"
+#| "\">Please try to download again&hellip;</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Merci "
+"d'essayer à nouveau de télécharger&hellip;</a>"
+
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
@@ -341,13 +395,20 @@ msgstr ""
"Merci d'essayer de télécharger à nouveau depuis un autre endroit ou un autre "
"ordinateur&hellip;"
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
@@ -490,6 +551,10 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr "[[Installer depuis macOS et la ligne de commande|install/mac/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgstr "[[Mettre à jour depuis Tails|upgrade/tails]]"
+
+#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Burn on a DVD|dvd]]"
msgstr "[[Graver sur un DVD|dvd]]"
@@ -498,10 +563,6 @@ msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
"[[Exécuter dans une machine virtuelle|doc/advanced_topics/virtualization]]"
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
-msgstr "[[Mettre à jour depuis Tails|upgrade/tails]]"
-
#. type: Content of: <div><div><div><p>
msgid ""
"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
@@ -610,6 +671,12 @@ msgstr "<code>https://tails.boum.org/install/vm-download/index.fr.html</code>"
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr "<code>https://tails.boum.org/install/download/index.fr.html</code>"
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<code>https://tails.boum.org/install/download/</code>"
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr "<code>https://tails.boum.org/install/download/index.fr.html</code>"
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr "Téléchargement BitTorrent"
@@ -657,12 +724,36 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails (fichier Torrent)"
-#. type: Content of: <div><div><div>
-msgid ""
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"indent\">Télécharger le fichier Torrent Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a>"
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
@@ -686,11 +777,39 @@ msgstr ""
"Votre client BitTorrent va automatiquement vérifier votre téléchargement "
"lorsqu'il est terminé."
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
+"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
+"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
+"mise à jour</span>"
+
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Open and download the Torrent file with your BitTorrent client. It "
+#| "contains the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image that you will use in the next step."
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
"Ouvrez et télécharger le fichier Torrent avec votre client BitTorrent. Il "
"contient l'image ISO de Tails [[!inline pages=\"inc/stable_amd64_version\" "
@@ -714,11 +833,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr "Téléchargement de la [[clé de signature Tails|tails-signing.key]]."
#. type: Content of: <div><ol><li><p>
-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> and save it to the same "
-"folder where you saved the ISO image."
+#, 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> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
@@ -811,8 +940,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -829,16 +963,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Ouvrez <span class=\"application\">Finder</span> et naviguez jusqu'au "
"dossier où vous avez enregistré l'image ISO et la signature."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -855,9 +998,13 @@ msgid "In Tails"
msgstr "Pour Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
"enregistré l'image ISO et la signature."
@@ -871,7 +1018,9 @@ msgstr ""
"\">Ouvrir avec Vérifier la signature</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La vérification de l'image ISO démarre automatiquement :"
#. type: Content of: <div><ol><li><p>
@@ -887,7 +1036,19 @@ msgstr ""
"informant que la signature est bonne :"
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -899,9 +1060,13 @@ msgid "Using the command line"
msgstr "En ligne de commande"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
"l'image ISO et la signature."
@@ -911,8 +1076,22 @@ msgid "Execute:"
msgstr "Exécutez la commande :"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -921,9 +1100,25 @@ msgid "The output of this command should be the following:"
msgstr "La sortie de cette commande devrait être :"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -1021,11 +1216,18 @@ msgstr ""
"signature de Tails avec la toile de confiance OpenPGP."
#. type: Content of: <div><div><p>
-msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+#, fuzzy
+#| msgid ""
+#| "If you are verifying an ISO image from inside Tails, for example, to do a "
+#| "manual upgrade, then you already have the Tails signing key. You can "
+#| "trust this signing key as much as you already trust your Tails "
+#| "installation since this signing key is included in your Tails "
+#| "installation."
+msgid ""
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Si vous vérifiez une image ISO depuis Tails, par exemple pour faire une mise "
"à jour manuelle, vous avez déjà la clé de signature de Tails. Vous pouvez "
@@ -1169,6 +1371,11 @@ msgstr ""
"des avertissements durant le processus de vérification."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.it.po b/wiki/src/install/inc/steps/download.inline.it.po
index a3f8d9b..6c842f6 100644
--- a/wiki/src/install/inc/steps/download.inline.it.po
+++ b/wiki/src/install/inc/steps/download.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,34 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
+#| "\"yes\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages="
+#| "\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> "
+#| "(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+#| "stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] immagine ISO </a> (<span class=\"remove-"
+"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+"\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
@@ -253,6 +280,24 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
+
+#. type: Content of: <div><div><div><div><div><div><p>
+#, 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 ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -304,13 +349,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -435,15 +480,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -535,6 +580,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -572,7 +621,7 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -581,10 +630,29 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
+
+#. type: Content of: <div><div><div><div>
+#, 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 ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -603,11 +671,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -633,10 +712,14 @@ msgstr ""
#| "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> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the 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\" "
@@ -726,8 +809,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -744,16 +832,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Apri il <span class=\"application\">Finder</span> e naviga nella cartella "
"dove hai salvato l'immagine ISO e la firma."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -770,9 +867,13 @@ msgid "In Tails"
msgstr "Su Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Apri il navigatore di file e arriva nella cartella dove hai salvato "
"l'immagine ISO e la firma."
@@ -786,7 +887,9 @@ msgstr ""
"\">Open With Verify Signature</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
#. type: Content of: <div><ol><li><p>
@@ -800,7 +903,19 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -812,9 +927,13 @@ msgid "Using the command line"
msgstr "Usare la riga di comando"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Apri un terminale e naviga nella cartella dove hai salvato l'immagine ISO e "
"la firma."
@@ -824,8 +943,22 @@ msgid "Execute:"
msgstr "Esegui:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -834,9 +967,25 @@ msgid "The output of this command should be the following:"
msgstr "L'output di questo comando dovrebbe essere il seguente:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -941,10 +1090,10 @@ msgstr ""
#| "Tails. You can trust this signing key as much as you are trusting your "
#| "Tails installation already because you are not downloading it."
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Se stai verificando un'immagine ISO essendo già in Tails, per esempio per "
"fare un aggiornamento manuale, allora la chiave di firma Tails è già inclusa "
@@ -1124,6 +1273,11 @@ msgstr ""
"di alcuni degli avvertimenti duranta il processo di verifica."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Verify the date of the signature to make sure that you downloaded the "
#~ "latest version."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index 2ffb0e0..b3aa82f 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,22 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -223,6 +238,13 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -270,13 +292,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -401,15 +423,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -501,6 +523,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -538,12 +564,20 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
#. type: Content of: <div><div><div><h3>
@@ -558,11 +592,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -581,10 +626,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
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> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
#. type: Content of: <div><h3>
@@ -658,7 +707,7 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -674,12 +723,12 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -694,8 +743,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
@@ -705,7 +754,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -719,7 +768,15 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr ""
#. type: Content of: <div>
@@ -732,8 +789,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -742,7 +799,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -751,8 +815,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
-"\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -827,10 +897,10 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
#. type: Content of: <div><p>