summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-11-27 00:08:54 +0000
committersajolida <sajolida@pimienta.org>2017-11-27 00:08:54 +0000
commitbf0cbac2bc8a1607b592d120a252394c30ef9850 (patch)
tree407a1ca274fe7d046baf827162c46434a3c8c34a
parent4da91e3ada7010f1a7e54de22856d2374d1ceb89 (diff)
Update PO files
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po11
-rw-r--r--wiki/src/install/debian/clone-overview.de.po50
-rw-r--r--wiki/src/install/debian/clone-overview.fa.po17
-rw-r--r--wiki/src/install/debian/clone-overview.fr.po45
-rw-r--r--wiki/src/install/debian/clone-overview.it.po38
-rw-r--r--wiki/src/install/debian/clone-overview.pt.po17
-rw-r--r--wiki/src/install/debian/usb-overview.de.po55
-rw-r--r--wiki/src/install/debian/usb-overview.fa.po33
-rw-r--r--wiki/src/install/debian/usb-overview.fr.po65
-rw-r--r--wiki/src/install/debian/usb-overview.it.po62
-rw-r--r--wiki/src/install/debian/usb-overview.pt.po33
-rw-r--r--wiki/src/install/expert/usb-overview.de.po35
-rw-r--r--wiki/src/install/expert/usb-overview.fa.po29
-rw-r--r--wiki/src/install/expert/usb-overview.fr.po65
-rw-r--r--wiki/src/install/expert/usb-overview.it.po43
-rw-r--r--wiki/src/install/expert/usb-overview.pt.po29
-rw-r--r--wiki/src/install/expert/usb.de.po10
-rw-r--r--wiki/src/install/expert/usb.fa.po4
-rw-r--r--wiki/src/install/expert/usb.fr.po10
-rw-r--r--wiki/src/install/expert/usb.it.po10
-rw-r--r--wiki/src/install/expert/usb.pt.po4
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.de.po812
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fa.po581
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.fr.po770
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.it.po755
-rw-r--r--wiki/src/install/inc/steps/download_2.inline.pt.po587
-rw-r--r--wiki/src/install/linux/clone-overview.de.po33
-rw-r--r--wiki/src/install/linux/clone-overview.fa.po17
-rw-r--r--wiki/src/install/linux/clone-overview.fr.po45
-rw-r--r--wiki/src/install/linux/clone-overview.it.po32
-rw-r--r--wiki/src/install/linux/clone-overview.pt.po17
-rw-r--r--wiki/src/install/linux/usb-overview.de.po45
-rw-r--r--wiki/src/install/linux/usb-overview.fa.po30
-rw-r--r--wiki/src/install/linux/usb-overview.fr.po60
-rw-r--r--wiki/src/install/linux/usb-overview.it.po47
-rw-r--r--wiki/src/install/linux/usb-overview.pt.po30
-rw-r--r--wiki/src/install/mac.de.po6
-rw-r--r--wiki/src/install/mac.fa.po4
-rw-r--r--wiki/src/install/mac.fr.po6
-rw-r--r--wiki/src/install/mac.it.po6
-rw-r--r--wiki/src/install/mac.pt.po4
-rw-r--r--wiki/src/install/mac/clone-overview.de.po33
-rw-r--r--wiki/src/install/mac/clone-overview.fa.po17
-rw-r--r--wiki/src/install/mac/clone-overview.fr.po45
-rw-r--r--wiki/src/install/mac/clone-overview.it.po32
-rw-r--r--wiki/src/install/mac/clone-overview.pt.po17
-rw-r--r--wiki/src/install/mac/dvd-overview.de.po38
-rw-r--r--wiki/src/install/mac/dvd-overview.fa.po23
-rw-r--r--wiki/src/install/mac/dvd-overview.fr.po58
-rw-r--r--wiki/src/install/mac/dvd-overview.it.po41
-rw-r--r--wiki/src/install/mac/dvd-overview.pt.po23
-rw-r--r--wiki/src/install/mac/usb-overview.de.po50
-rw-r--r--wiki/src/install/mac/usb-overview.fa.po23
-rw-r--r--wiki/src/install/mac/usb-overview.fr.po58
-rw-r--r--wiki/src/install/mac/usb-overview.it.po44
-rw-r--r--wiki/src/install/mac/usb-overview.pt.po23
-rw-r--r--wiki/src/install/win/clone-overview.de.po50
-rw-r--r--wiki/src/install/win/clone-overview.fa.po17
-rw-r--r--wiki/src/install/win/clone-overview.fr.po45
-rw-r--r--wiki/src/install/win/clone-overview.it.po55
-rw-r--r--wiki/src/install/win/clone-overview.pt.po17
-rw-r--r--wiki/src/install/win/usb-overview.de.po48
-rw-r--r--wiki/src/install/win/usb-overview.fa.po30
-rw-r--r--wiki/src/install/win/usb-overview.fr.po60
-rw-r--r--wiki/src/install/win/usb-overview.it.po47
-rw-r--r--wiki/src/install/win/usb-overview.pt.po30
-rw-r--r--wiki/src/news/what_we_accomplished_in_2017.de.po6
-rw-r--r--wiki/src/upgrade.de.po6
-rw-r--r--wiki/src/upgrade.fa.po4
-rw-r--r--wiki/src/upgrade.fr.po6
-rw-r--r--wiki/src/upgrade.it.po6
-rw-r--r--wiki/src/upgrade.pt.po6
-rw-r--r--wiki/src/upgrade/clone-overview.de.po23
-rw-r--r--wiki/src/upgrade/clone-overview.fa.po14
-rw-r--r--wiki/src/upgrade/clone-overview.fr.po41
-rw-r--r--wiki/src/upgrade/clone-overview.it.po22
-rw-r--r--wiki/src/upgrade/clone-overview.pt.po22
-rw-r--r--wiki/src/upgrade/tails-overview.de.po27
-rw-r--r--wiki/src/upgrade/tails-overview.fa.po16
-rw-r--r--wiki/src/upgrade/tails-overview.fr.po45
-rw-r--r--wiki/src/upgrade/tails-overview.it.po30
-rw-r--r--wiki/src/upgrade/tails-overview.pt.po26
83 files changed, 3275 insertions, 2507 deletions
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
index 1595044..c7a250a 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-11-01 13:32+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-11-14 13:51+0000\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index 9316563..9635caf 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-10-11 09:54+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-11-12 19:38+0100\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
@@ -33,7 +33,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[!toc levels=1]]\n"
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -180,10 +179,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "**To start Tails without options**, click on the\n"
-#| "<span class=\"button\">Login</span> button, or just press\n"
-#| "<span class=\"keycap\">Enter</span>.\n"
msgid ""
"To start Tails without options, click on the\n"
"<span class=\"button\">Start Tails</span> button.\n"
@@ -193,7 +188,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"boot_menu\"></a>\n"
msgid "<a id=\"locale\"></a>\n"
msgstr "<a id=\"locale\"></a>\n"
@@ -314,7 +308,6 @@ msgstr " [[!img US_calendar_in_Russian.png link=\"no\" alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"boot_menu\"></a>\n"
msgid "<a id=\"persistence\"></a>\n"
msgstr "<a id=\"persistence\"></a>\n"
@@ -342,7 +335,6 @@ msgstr "[[!img persistence.png link=\"no\" alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"boot_menu\"></a>\n"
msgid "<a id=\"additional\"></a>\n"
msgstr "<a id=\"additional\"></a>\n"
@@ -393,7 +385,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[MAC address spoofing|mac_spoofing]]"
msgid " [[See our documentation about MAC address spoofing.|mac_spoofing]]\n"
msgstr " [[Lesen Sie unsere Dokumentation zum Verschleiern der MAC-Adresse.|mac_spoofing]]\n"
diff --git a/wiki/src/install/debian/clone-overview.de.po b/wiki/src/install/debian/clone-overview.de.po
index 76f62c1..81243aa 100644
--- a/wiki/src/install/debian/clone-overview.de.po
+++ b/wiki/src/install/debian/clone-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:11+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.8.6\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,23 +33,17 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Zurück</span>|install/debian]]"
-
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/clone]]"
-msgid "[[Back|install/debian]]"
-msgstr "|install/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren."
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta "
+"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title="
+"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
+"\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Zurück</span>|install/"
+"debian]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -49,3 +52,16 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#, fuzzy
+#~| msgid "|install/clone]]"
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "|install/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Von einem <strong>anderen Tails</strong> aus installieren."
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/clone-overview.fa.po b/wiki/src/install/debian/clone-overview.fa.po
index cdf9365..85cc216 100644
--- a/wiki/src/install/debian/clone-overview.fa.po
+++ b/wiki/src/install/debian/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/debian/clone-overview.fr.po b/wiki/src/install/debian/clone-overview.fr.po
index 8f97952..5367110 100644
--- a/wiki/src/install/debian/clone-overview.fr.po
+++ b/wiki/src/install/debian/clone-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:12+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -16,6 +16,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -23,21 +32,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installer depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -46,3 +50,14 @@ msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installer depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/clone-overview.it.po b/wiki/src/install/debian/clone-overview.it.po
index 2b3633e..81d7c3b 100644
--- a/wiki/src/install/debian/clone-overview.it.po
+++ b/wiki/src/install/debian/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-05 14:00+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-07-23 14:37+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da un'altra Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -34,19 +44,6 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw="
"\"yes\" sort=\"age\"]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Indietro|install/debian.it]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installa da <strong>un'altra Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -54,3 +51,14 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone.it]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Indietro|install/debian.it]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installa da <strong>un'altra Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/clone-overview.pt.po b/wiki/src/install/debian/clone-overview.pt.po
index cdf9365..85cc216 100644
--- a/wiki/src/install/debian/clone-overview.pt.po
+++ b/wiki/src/install/debian/clone-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/debian/usb-overview.de.po b/wiki/src/install/debian/usb-overview.de.po
index 28edf72..c41d311 100644
--- a/wiki/src/install/debian/usb-overview.de.po
+++ b/wiki/src/install/debian/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-07 10:46+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,14 @@ msgstr ""
#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
#| "\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Von Debian oder Ubuntu aus installieren\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,29 +44,29 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw="
"\"yes\"]] [[<span class=\"back\">Zurück</span>|install/win]]"
-#. type: Content of: <div>
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Los geht's!"
+
+#. type: Content of: outside any tag (error?)
#, fuzzy
#| msgid "|install/debian/usb]]"
-msgid "[[Back|install/debian]]"
+msgid "|install/debian/usb-download]]"
msgstr "|install/debian/usb]]"
-#. type: Content of: <h1>
#, fuzzy
-#| msgid "Install from <strong>Debian or Ubuntu</strong>"
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr "Von <strong>Debian oder Ubuntu</strong> aus installieren"
+#~| msgid "|install/debian/usb]]"
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "|install/debian/usb]]"
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Los geht's!"
+#, fuzzy
+#~| msgid "Install from <strong>Debian or Ubuntu</strong>"
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr "Von <strong>Debian oder Ubuntu</strong> aus installieren"
-#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
-msgstr "|install/debian/usb]]"
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/usb-overview.fa.po b/wiki/src/install/debian/usb-overview.fa.po
index 6a7fd41..0164e7a 100644
--- a/wiki/src/install/debian/usb-overview.fa.po
+++ b/wiki/src/install/debian/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,27 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -46,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/debian/usb-overview.fr.po b/wiki/src/install/debian/usb-overview.fr.po
index a7ed9c2..33138d3 100644
--- a/wiki/src/install/debian/usb-overview.fr.po
+++ b/wiki/src/install/debian/usb-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:13+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,37 +17,54 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
+msgstr ""
+"[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint : vue d'ensemble\"]] "
+"[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-"Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
-"<strong>Mint</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr"
+"\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
+#, fuzzy
+#| msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr "|install/debian/usb]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr ""
+#~ "Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
+#~ "<strong>Mint</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/usb-overview.it.po b/wiki/src/install/debian/usb-overview.it.po
index a08c467..c4d10d2 100644
--- a/wiki/src/install/debian/usb-overview.it.po
+++ b/wiki/src/install/debian/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-05 14:00+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-06-03 18:00+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -17,14 +17,24 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da Debian o Ubuntu o MInt\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -34,27 +44,27 @@ msgstr ""
"inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw=\"yes"
"\"]] [[<span class=\"back\">Indietro</span>|install/win.it]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Indietro|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-"Installa da <strong>Debian</strong>, <strong>Ubuntu</strong> o <strong>Mint</"
-"strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
+#, fuzzy
+#| msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr "|install/debian/usb.it]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Indietro|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>"
+#~ msgstr ""
+#~ "Installa da <strong>Debian</strong>, <strong>Ubuntu</strong> o "
+#~ "<strong>Mint</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/debian/usb-overview.pt.po b/wiki/src/install/debian/usb-overview.pt.po
index 6a7fd41..0164e7a 100644
--- a/wiki/src/install/debian/usb-overview.pt.po
+++ b/wiki/src/install/debian/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,27 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Debian, Ubuntu, or Mint: overview\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
-"[[!meta stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Debian, Ubuntu, or Mint\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/debian\" rel=\"stylesheet\" title=\"\"]] [[!"
+"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
+"sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -46,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/debian/usb]]"
+msgid "|install/debian/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/expert/usb-overview.de.po b/wiki/src/install/expert/usb-overview.de.po
index 78b5449..d677743 100644
--- a/wiki/src/install/expert/usb-overview.de.po
+++ b/wiki/src/install/expert/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-14 02:51+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -29,12 +29,13 @@ msgstr ""
#| "\">Back</span>|install/debian]]"
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installation von Debian oder Ubuntu aus unter Nutzung der "
"Kommandozeile und GnuPG\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet"
@@ -45,21 +46,6 @@ msgstr ""
"installation-assistant.inline.de\" raw=\"yes\"]] [[<span class=\"back"
"\">Zurück</span>|install/debian]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
@@ -68,6 +54,11 @@ msgstr "Los geht's!"
msgid "|install/expert/usb]]"
msgstr "|install/expert/usb]]"
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+
#, fuzzy
#~| msgid "<small>Install from Debian or Ubuntu using the</small>"
#~ msgid "<small>Install from Debian, Ubuntu, or Mint using the</small>"
diff --git a/wiki/src/install/expert/usb-overview.fa.po b/wiki/src/install/expert/usb-overview.fa.po
index ddc34fc..8c288df 100644
--- a/wiki/src/install/expert/usb-overview.fa.po
+++ b/wiki/src/install/expert/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -19,26 +19,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/expert/usb-overview.fr.po b/wiki/src/install/expert/usb-overview.fr.po
index 809fb73..c9b4cfc 100644
--- a/wiki/src/install/expert/usb-overview.fr.po
+++ b/wiki/src/install/expert/usb-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:23+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,32 +17,34 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command "
+#| "line and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel="
+#| "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant"
+#| "\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+#| "overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+#| "stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+#| "\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+#| "\"]]"
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint avec la ligne de commande et GnuPG : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr "[[Retour|install/debian]]"
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
-"<strong>Mint</strong> <small>avec la ligne de commande et GnuPG</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis Debian, Ubuntu ou Mint avec la ligne de "
+"commande et GnuPG : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/expert\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age"
+"\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -51,3 +53,18 @@ msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
msgid "|install/expert/usb]]"
msgstr "|install/expert/usb]]"
+
+#~ msgid "[[Back|install/debian]]"
+#~ msgstr "[[Retour|install/debian]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong> <small>using the command line and GnuPG</small>"
+#~ msgstr ""
+#~ "Installer depuis <strong>Debian</strong>, <strong>Ubuntu</strong> ou "
+#~ "<strong>Mint</strong> <small>avec la ligne de commande et GnuPG</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/expert/usb-overview.it.po b/wiki/src/install/expert/usb-overview.it.po
index af31b43..c2db0e7 100644
--- a/wiki/src/install/expert/usb-overview.it.po
+++ b/wiki/src/install/expert/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-17 15:20+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -29,12 +29,13 @@ msgstr ""
#| "class=\"back\">Back</span>|install/debian]]"
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da Devian o Ubuntu usando la riga di comando e GnuPG"
"\"]] [[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!"
@@ -44,22 +45,6 @@ msgstr ""
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-"<small>Installa da <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong>usando la riga di comando e GnuPG</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -67,3 +52,15 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/expert/usb]]"
msgstr "|install/expert/usb]]"
+
+#~ msgid ""
+#~ "Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong> <small>using the command line and GnuPG</small>"
+#~ msgstr ""
+#~ "<small>Installa da <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
+#~ "<strong>Mint</strong>usando la riga di comando e GnuPG</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/expert/usb-overview.pt.po b/wiki/src/install/expert/usb-overview.pt.po
index ddc34fc..8c288df 100644
--- a/wiki/src/install/expert/usb-overview.pt.po
+++ b/wiki/src/install/expert/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -19,26 +19,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
"[[!meta title=\"Install from Debian, Ubuntu, or Mint using the command line "
-"and GnuPG: overview\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet"
-"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert"
-"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/debian]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid ""
-"Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or "
-"<strong>Mint</strong> <small>using the command line and GnuPG</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"and GnuPG\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/"
+"overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index 34dbaca..5876c73 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -109,10 +109,16 @@ msgstr ""
"OpenPGP Keys</a> (engl.) von <em>Riseup</em> nach.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
msgstr ""
"Diese Methode zur Verifizierung benutzt das OpenPGP Web of Trust und die von "
"offiziellen Debian-Entwicklern vorgenommenen Zertifizierungen über den "
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index c3eb3d1..4fb8e1e 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -97,7 +97,7 @@ msgstr ""
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index e6e3654..a612141 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-10-29 12:34+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -104,10 +104,16 @@ msgstr ""
"des clés OpenPGP</a> par <em>Riseup</em>.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
msgstr ""
"Cette méthode de vérification utilise la toile de confiance OpenPGP et les "
"certifications faites par des développeurs Debian officiels à la clé de "
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index e09d2b9..7f60545 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -104,10 +104,16 @@ msgstr ""
"OpenPGP Keys</a> di <em>Riseup</em>.</p>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This verification technique uses the OpenPGP Web of Trust and the "
+#| "certification made by official Debian developers on the Tails signing "
+#| "key. [[Learn more about the OpenPGP Web of Trust|install/download/"
+#| "openpgp#wot]]."
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
msgstr ""
"Questa tecnica di verifica usa la Web of Trust OpenPGP e la certificazione "
"fatta da sviluppatori Debian ufficiali sulla chiave di firma Tails. [[Impara "
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index c3eb3d1..4fb8e1e 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-09-25 20:19+0200\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -97,7 +97,7 @@ msgstr ""
msgid ""
"This verification technique uses the OpenPGP Web of Trust and the "
"certification made by official Debian developers on the Tails signing key. "
-"[[Learn more about the OpenPGP Web of Trust|install/download/openpgp#wot]]."
+"[[Learn more about the OpenPGP Web of Trust|install/download_2#openpgp]]."
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/inc/steps/download_2.inline.de.po b/wiki/src/install/inc/steps/download_2.inline.de.po
index 8e6dedd..7a9e238 100644
--- a/wiki/src/install/inc/steps/download_2.inline.de.po
+++ b/wiki/src/install/inc/steps/download_2.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-22 21:59+0100\n"
+"POT-Creation-Date: 2017-11-26 18:57+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"
@@ -29,93 +29,118 @@ msgstr ""
msgid "Direct download"
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>1.</span>Download Tails"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
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\" "
+#| "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\" class=\"use-mirror-pool btn btn-primary indent"
-"\">Download Tails 3.1 ISO image (1.2 GB)</a>"
+"\"]]\" 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>"
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><p>
-msgid "<a id=\"already-downloaded\">I already downloaded Tails 3.1.</a>"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]].</a>"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
#. 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>2.</span>Verify your download using your browser"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><p>
msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Lose time if your download is incomplete or broken due to an error during "
"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if our download mirrors have been compromised "
"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if your download is modified on the fly by an "
"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><ol>
msgid "\"\"\"]]"
msgstr ""
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn supported-browser firefox btn btn-primary\">Install <u>Tails "
-"Verification</u> extension</a> <a class=\"install-extension-btn supported-"
-"browser chrome btn btn-primary\">Install <u>Tails Verification</u> "
-"extension</a>"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -136,20 +161,19 @@ msgstr ""
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn firefox btn btn-primary\">Update extension</a> <a class=\"install-"
-"extension-btn chrome btn btn-primary\">Update extension</a>"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid "<u>Tails Verification</u> extension Installed!"
msgstr ""
-#. <a id="verify-download" class="btn btn-primary">
-#. Verify download&hellip;</a>
#. type: Content of: <div><div><div><div><div>
msgid ""
-"<label id=\"verify-download-wrapper\" class=\"btn btn-primary btn-verify\"> "
-"Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
"label>"
msgstr ""
@@ -166,13 +190,6 @@ msgid "<b>Verification failed!</b>"
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\">Please try to "
-"download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
msgstr ""
@@ -200,13 +217,14 @@ msgid "Downloading again is usually enough to fix this problem."
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
+msgid "<b>Verification failed again!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -241,10 +259,19 @@ msgid ""
"these issues."
msgstr ""
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3.</span>Continue installing"
+"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>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -258,52 +285,126 @@ msgid ""
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip verification|debian/usb]]</span> <span class="
-"\"windows\">[[Skip verification|win/usb]]</span> <span class=\"linux"
-"\">[[Skip verification|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
-"verification|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip verification|"
-"mac/dvd]]</span> <span class=\"dvd\">[[Skip verification|dvd]]</span> <span "
-"class=\"vm\">[[Skip verification|doc/advanced_topics/virtualization]]</span> "
-"<span class=\"upgrade-tails\">[[Skip verification|upgrade/tails]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Next: Install <em>Tails Installer</em>|debian/"
-"usb]]</span> <span class=\"windows\">[[Next: Install an intermediary Tails|"
-"win/usb]]</span> <span class=\"linux\">[[Next: Install an intermediary Tails|"
-"linux/usb]]</span> <span class=\"mac-usb\">[[Next: Install an intermediary "
-"Tails|mac/usb]]</span> <span class=\"mac-dvd\">[[Next: Burn a Tails DVD|mac/"
-"dvd]]</span> <span class=\"upgrade-tails\">[[Next: Install an intermediary "
-"Tails|upgrade/tails]]</span> (<span class=\"next-counter\"></span>)"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<span class=\"dvd\">[[Next: Burning Tails on a DVD|dvd]]</span> <span class="
-"\"vm\">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>"
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Windows|install/win/usb]]"
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From other Linux distributions|install/linux/usb]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS by burning a DVD first|install/mac/dvd]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS and the command line|install/mac/usb]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -324,8 +425,8 @@ msgstr ""
#. type: Content of: <div><div><div><ul><li>
msgid ""
-"Chrome and Chromium <span id=\"min-version-chrome\">$MINVER-CHROME</span> "
-"and later (<a href=\"https://www.google.com/chrome/\">Download</a>)"
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><ul><li>
@@ -340,21 +441,59 @@ msgid "Please update your browser to the latest version."
msgstr ""
#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
#. type: Content of: <div><div><h2>
@@ -388,23 +527,35 @@ msgstr ""
msgid "BitTorrent doesn't work over Tor or in Tails."
msgstr ""
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1.</span>Download Tails (Torrent file)"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <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_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary indent"
-"\">Download Tails 3.1 Torrent file</a>"
+"\"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>"
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><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2.</span>Verify your download using BitTorrent"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -413,48 +564,21 @@ msgid ""
"complete."
msgstr ""
-#. type: Content of: <h1>
-msgid "Download and verify using OpenPGP"
-msgstr "Herunterladen und mit OpenPGP verifizieren"
-
-#. type: Content of: <p>
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have <em>GPG</em> installed but might need guidance on "
-"performing the verification."
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-"Diese Anweisungen sind für Personen, die bereits mit der grundsätzlichen "
-"Benutzung von OpenPGP vertraut sind und <em>GPG</em> installiert haben, aber "
-"möglicherweise Hilfe zur Durchführung der Verifizierung benötigen."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <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> "
-#| "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_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>)."
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
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: <ol><li><p>
+#. 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\" "
@@ -467,69 +591,30 @@ msgstr ""
"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
"Image gespeichert haben."
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-"Wenn Sie die Verifizierung zum ersten Mal durchführen, laden Sie den "
-"[[Signaturschlüssel von Tails|tails-signing.key]] herunter und importieren "
-"Sie ihn in Ihren Schlüsselbund. Wenn Sie von einem Tails aus arbeiten, ist "
-"der Signaturschlüssel bereits enthalten."
-
-"[[!meta title=\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/"
-"stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!meta link="
-"\"https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl"
-"\" rel=\"chrome-webstore-item\"]] [[!inline pages=\"install/inc/steps/"
-"download_2.inline\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <ol><li><p>
-msgid ""
-"All our ISO images are signed with the same signing key, so you only have to "
-"import it once. Still, you have to verify the ISO image every time you "
-"download a new one."
-msgstr ""
-"Alle ISO-Images sind mit dem gleichen Signaturschlüssel signiert, somit "
-"müssen Sie ihn nur einmal importieren. Dennoch werden Sie jedes mal, wenn Sie "
-"ein neues ISO-Image herunterladen, es erneut verifizieren müssen."
-
-#. type: Content of: <ol><li><div><p>
-msgid ""
-"This download of the Tails signing key is protected using HTTPS. But you "
-"could still download a malicious signing key if our website is compromised "
-"or if you are victim of a [[man-in-the-middle attack|doc/about/warning#man-"
-"in-the-middle]]."
-msgstr ""
-"Dieser Download des Signaturschlüssels von Tails wird durch HTTPS "
-"geschützt. "
-"Dennoch könnten Sie, falls unsere Webseite kompromittiert ist oder Sie "
-"Opfer eines "
-"[[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-middle]] sind, "
-"einen bösartigen Signaturschlüssel herunterladen."
-
-#. type: Content of: <ol><li><div><p>
-msgid ""
-"For additional verification, you can <a href=\"#wot\">authenticate the "
-"signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-"Für zusätzliche Verifizierung <a href=\"#wot\">authentifizieren Sie "
-"den Signaturschlüssel "
-"durch das OpenPGP Web of Trust</a>."
-
-#. type: Content of: <h2>
-msgid "Verify the ISO image"
-msgstr "Das ISO-Image verifizieren"
-
-#. type: Content of: <p>
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><p>
msgid "This section provides simplified instructions:"
msgstr "Dieser Abschnitt bietet vereinfachte Anweisungen:"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
"span></a>"
@@ -537,7 +622,7 @@ msgstr ""
"<a href=\"#windows\">Unter Windows mit <span class=\"application\">Gpg4win</"
"span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
"a>"
@@ -545,49 +630,33 @@ msgstr ""
"<a href=\"#mac\">Unter macOS mit <span class=\"application\">GPGTools</"
"span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#tails\">In Tails</a>"
msgstr "<a href=\"#tails\">In Tails</a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#command-line\">Using the command line</a>"
msgstr "<a href=\"#command-line\">Mittels der Kommandozeile</a>"
-#. type: Content of: <div><p>
-msgid ""
-"As explained above in step 3, this simple OpenPGP verification provides a "
-"level of verification equivalent to HTTPS, like the [[Firefox extension or "
-"BitTorrent|install/download]], unless you also <a href=\"#wot\">authenticate "
-"the signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-"Wie weiter oben in Schritt 3 beschrieben, bietet diese einfache, mit "
-"HTTPS vergleichbare "
-"Verifizierung mit OpenPGP ein Verifizierungsniveau, welches mit der "
-"[[Firefoxerweiterung "
-"oder BitTorrent|install/download]] vergleichbar ist, es sei denn Sie "
-"<a href=\"#wot\">authentifizieren den Signaturschlüssel zusätzlich durch das "
-"OpenPGP Web of Trust</a>."
-
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"windows\"></a>"
msgstr "<a id=\"windows\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Windows with <span class=\"application\">Gpg4win</span>"
msgstr "Unter Windows mit <span class=\"application\">Gpg4win</span>"
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
"See the [[<span class=\"application\">Gpg4win</span> documentation on "
"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
msgstr ""
"Lesen Sie die entsprechende [[<span class=\"application\">Gpg4win</span>-"
-"Dokumentation zum "
-"Prüfen von Signaturen|http://www.gpg4win.org/doc/de/gpg4win-compendium_24."
-"html#id5]]."
+"Dokumentation zum Prüfen von Signaturen|http://www.gpg4win.org/doc/de/"
+"gpg4win-compendium_24.html#id5]]."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"Verify the date of the signature to make sure that you downloaded the latest "
"version."
@@ -595,11 +664,12 @@ msgstr ""
"Verifizieren Sie das Datum der Signatur, um sicherzustellen, dass Sie die "
"aktuellste Version heruntergeladen haben."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "If the following warning appears:"
msgstr "Wenn die folgende Warnung erscheint:"
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
"Not enough information to check the signature validity.\n"
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
@@ -609,27 +679,26 @@ msgstr ""
"Signiert am ... von tails@boum.org (Schlüssel-ID: 0x58ACD84F\n"
"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
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>."
msgstr ""
"Dann ist das ISO-Image dennoch im Bezug auf den von Ihnen heruntergeladenen "
-"Signaturschlüssel "
-"korrekt. Um diese Warnung zu entfernen, müssen Sie den Signaturschlüssel "
-"durch das "
-"<a href=\"#wot\">OpenPGP Web of Trust authentifizieren</a>."
+"Signaturschlüssel korrekt. Um diese Warnung zu entfernen, müssen Sie den "
+"Signaturschlüssel durch das <a href=\"#wot\">OpenPGP Web of Trust "
+"authentifizieren</a>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"mac\"></a>"
msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
-#. type: Content of: <ol><li>
+#. 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."
@@ -637,26 +706,25 @@ 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: <ol><li>
+#. type: Content of: <div><ol><li>
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>."
msgstr ""
-"Rechtsklicken Sie auf das ISO-Image und wählen Sie "
-"<span class=\"guimenuchoice\"> "
-"<span class=\"guisubmenu\">Dienste</span> ▸ "
-"<span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
+"Rechtsklicken Sie auf das ISO-Image und wählen Sie <span class="
+"\"guimenuchoice\"> <span class=\"guisubmenu\">Dienste</span> ▸ <span class="
+"\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"tails\"></a>"
msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Tails"
msgstr "In Tails"
-#. type: Content of: <ol><li>
+#. 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."
@@ -664,7 +732,7 @@ msgstr ""
"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
"ISO-Image und die Signatur gespeichert haben."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
"With Verify Signature</span>."
@@ -672,15 +740,15 @@ msgstr ""
"Rechtsklicken Sie auf die Signatur und wählen Sie <span class=\"guimenuitem"
"\">Mit Signatur-Datei überprüfen öffnen</span>."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid "The verification of the ISO image starts automatically:"
msgstr "Die Verifizierung des ISO-Image startet automatisch:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"After the verification finishes, click on the notification counter in the "
"bottom-right corner and on the notification with a transparent background on "
@@ -691,19 +759,19 @@ msgstr ""
"Benachrichtigung mit einem durchsichtigen Hintergrund auf der rechten Seite "
"des Benachrichtigungsbereichs:"
-#. type: Content of: <ol><li><p>
+#. 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\"]]"
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
msgstr "<a id=\"command-line\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "Using the command line"
msgstr "Mithilfe der Kommandozeile"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Open a terminal and navigate to the folder where you saved the ISO image and "
"the signature."
@@ -711,21 +779,21 @@ msgstr ""
"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
"Image und die Signatur gespeichert haben."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "Execute:"
msgstr "Führen Sie aus:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "The output of this command should be the following:"
msgstr " Die Ausgabe des Befehls sollte folgende sein:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -733,62 +801,92 @@ msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "If the output also includes:"
msgstr "Wenn die Ausgabe auch folgendes enthält:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: WARNING: This key is not certified with a trusted signature!"
msgstr "gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: There is no indication that the signature belongs to the owner."
-msgstr "gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem "
-"vorgeblichen Besitzer gehört."
+msgstr ""
+"gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
+"Besitzer gehört."
-#. type: Content of: <ol>
-msgid "<a id=\"wot\"></a>"
+#. type: Content of: <div><ol>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
msgstr "<a id=\"wot\"></a>"
-#. type: Content of: <ol><h2>
+#. type: Content of: <div><ol><h3>
msgid "Authenticate the signing key through the OpenPGP Web of Trust"
-msgstr "Authentifizieren Sie den Signaturschlüssel durch das OpenPGP Web of Trust"
+msgstr ""
+"Authentifizieren Sie den Signaturschlüssel durch das OpenPGP Web of Trust"
+
+#. type: Content of: <div><ol><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div><ol>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
"Die bisher vorgestellten Methoden zur Verifizierung ([[Firefoxerweiterung, "
"BitTorrent|install/download]] oder OpenPGP-Verfizierung) basieren alle auf "
"einigen, sicher mit HTTPS von unserer Webseite heruntergeladenen "
"Informationen:"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>checksum</em> for the Firefox extension"
msgstr "Die <em>Prüfsumme</em> für die Firefoxerweiterung"
-#. type: Content of: <ol><ul><li>
-
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Torrent file</em> for BitTorrent"
msgstr "Die <em>Torrentdatei</em> für BitTorrent"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Tails signing key</em> for the OpenPGP verification"
msgstr "Der <em>Signaturschlüssel von Tails</em> für die OpenPGP-Verfizierung"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
msgid ""
"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
"about/warning#man-in-the-middle]]."
msgstr ""
"Jedoch könnten Sie, wenn unsere Website kompromittiert wurde oder Sie ein "
"Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-in-the-"
"middle]] sind, gefälschte Informationen herunterladen."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP verification is the only technique that allows you to verify the "
"ISO image even better by also authenticating the Tails signing key through "
@@ -800,7 +898,7 @@ msgstr ""
"bessere Authentifizierung bietet. Durch das Vertrauen in das OpenPGP Web of "
"Trust können Sie sich vollständig gegen schadhafte Downloads schützen."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are verifying an ISO image from inside Tails already, for example to "
"do a manual upgrade, then the Tails signing key is already included in "
@@ -808,15 +906,12 @@ msgid ""
"installation already because you are not downloading it."
msgstr ""
"Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum "
-"Beispiel "
-"wenn Sie eine manuelle Aktualisierung durchführen, ist der Signaturschlüssel "
-"von Tails "
-"bereits in dem Tails enthalten. Da Sie ihn nicht herunterladen, können Sie "
-"diesem "
-"Signaturschlüssel in dem gleichen Maße, wie dem bereits installierten Tails "
-"vertrauen."
+"Beispiel wenn Sie eine manuelle Aktualisierung durchführen, ist der "
+"Signaturschlüssel von Tails bereits in dem Tails enthalten. Da Sie ihn nicht "
+"herunterladen, können Sie diesem Signaturschlüssel in dem gleichen Maße, wie "
+"dem bereits installierten Tails vertrauen."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"One of the inherent problems of standard HTTPS is that the trust we usually "
"put in a website is defined by certificate authorities: a hierarchical and "
@@ -833,7 +928,7 @@ msgstr ""
"Angriffe verwundbar, [[wie wir es auf unserer Warnungsseite beschreiben|"
"about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"We believe that, instead, users should be given the final say when trusting "
"a website, and that designation of trust should be done on the basis of "
@@ -844,7 +939,7 @@ msgstr ""
"das Herstellen von Vertrauen auf der Basis von menschlicher Interaktion "
"geschehen sollte."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
"on OpenPGP keys that can help solving this problem. Let's see this with an "
@@ -854,34 +949,35 @@ msgstr ""
"OpenPGP-Schlüsseln basierendes, dezentrales Vertrauensmodell. Werfen wir mit "
"einem Beispiel einen Blick darauf:"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
msgid ""
-"<em>You are friend with Alice and really trust her way of managing OpenPGP "
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
"keys. So you are trusting Alice's key.</em>"
msgstr ""
"<em>Sie sind mit Alice befreundet und vertrauen ihr wirklich, wie sie ihre "
-"OpenPGP-Schlüssel verwaltet. "
-"Sie vertrauen dem Schlüssel von Alice.</em>"
+"OpenPGP-Schlüssel verwaltet. Sie vertrauen dem Schlüssel von Alice.</em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
"certified Bob's key. So Alice is trusting Bob's key.</em>"
msgstr ""
"<em>Hinzu kommt, dass Alice Bob, einen Tails-Entwickler, bei einer Konferenz "
-"trifft und "
-"Bobs Schlüssel signiert. Alice vertraut Bobs Schlüssel.</em>"
+"trifft und Bobs Schlüssel signiert. Alice vertraut Bobs Schlüssel.</em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
"fully trusts the Tails signing key.</em>"
msgstr ""
"<em>Bob ist ein Tails Entwickler, welcher direkt den Signaturschlüssel von "
-"Tails besitzt. Bob "
-"vertraut dem Signaturschlüssel von Tails vollständig.</em>"
+"Tails besitzt. Bob vertraut dem Signaturschlüssel von Tails vollständig.</em>"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"In this scenario, Alice found a path to trust the Tails signing key without "
"the need to rely on certificate authorities."
@@ -890,8 +986,8 @@ msgstr ""
"von Tails, welcher es Ihnen erlauben kann, ihm ohne die Abhängigkeit von "
"Zertifizierungsstellen zu vertrauen."
-#. type: Content of: <ol><div><p>
-#, fuzzy, no-wrap
+#. type: Content of: <div><ol><div><p>
+#, fuzzy
#| msgid ""
#| "<p>If you are on Debian or Ubuntu, you can install the\n"
#| "<code>debian-keyring</code> package which contains the OpenPGP keys of\n"
@@ -909,18 +1005,15 @@ msgid ""
"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
"usb]]."
msgstr ""
-"Wenn Sie Debian oder Ubuntu benutzen, können Sie das Paket "
-"<code>debian-keyring</code>, welches die OpenPGP-Schlüssel aller "
-"Entwickelnden von Debian enthält, installieren. Einige Entwickelnde von "
-"Debian "
-"haben, um einen Vertrauenspfad aufzubauen, den Signaturschlüssel von Tails "
-"zertifiziert. "
-"Diese Vorgehensweise wird in unseren Anweisungen zur "
-"[[Installation von Tails auf einem USB-Stick unter Verwendung der "
-"Kommandozeile "
-"von Debian oder Ubuntu aus|install/expert/usb]] näher beschrieben."
+"Wenn Sie Debian oder Ubuntu benutzen, können Sie das Paket <code>debian-"
+"keyring</code>, welches die OpenPGP-Schlüssel aller Entwickelnden von Debian "
+"enthält, installieren. Einige Entwickelnde von Debian haben, um einen "
+"Vertrauenspfad aufzubauen, den Signaturschlüssel von Tails zertifiziert. "
+"Diese Vorgehensweise wird in unseren Anweisungen zur [[Installation von "
+"Tails auf einem USB-Stick unter Verwendung der Kommandozeile von Debian oder "
+"Ubuntu aus|install/expert/usb]] näher beschrieben."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Relying on the Web of Trust requires both caution and intelligent "
"supervision by the users. The technical details are outside of the scope of "
@@ -930,7 +1023,7 @@ msgstr ""
"als auch intelligente Kontrolle durch Nutzende. Die technischen Details "
"übersteigen den Umfang dieses Dokuments."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Since the Web of Trust is actually based on human relationships and real-"
"life interactions, the best is to get in touch with people knowledgeable "
@@ -943,7 +1036,7 @@ msgstr ""
"benutzen und Vertrauensverhältnisse aufzubauen, damit Sie Ihren eigenen "
"Vertrauenspfad zum Signaturschlüssel von Tails finden."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"For example, you can start by contacting a local [[!wikipedia "
"Linux_User_Group]], [[an organization offering Tails training|support/"
@@ -955,53 +1048,128 @@ msgstr ""
"Umgebung in Kontakt treten und sich über deren Methoden bezüglich OpenPGP "
"austauschen."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
msgid ""
-"After you built a trust path, you can certify the Tails signing key by "
+"After you build a trust path, you can certify the Tails signing key by "
"signing it with your own key to get rid of some warnings during the "
"verification process."
msgstr ""
"Nachdem Sie einen Vertrauenspfad aufgebaut haben, können Sie den "
"Signaturschlüssel von Tails mit Ihrem eigenen Schlüssel zertifizieren, um "
-"einige der "
-"Warnungen während des Verifizierungsprozesses loszuwerden."
+"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Herunterladen und mit OpenPGP verifizieren"
-#. type: Content of: <ol><h2>
-msgid "Further reading on OpenPGP"
-msgstr "Weitere Literatur zu OpenPGP"
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Diese Anweisungen sind für Personen, die bereits mit der grundsätzlichen "
+#~ "Benutzung von OpenPGP vertraut sind und <em>GPG</em> installiert haben, "
+#~ "aber möglicherweise Hilfe zur Durchführung der Verifizierung benötigen."
-#. type: Content of: <ol><ul><li>
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr "[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP Software"
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Wenn Sie die Verifizierung zum ersten Mal durchführen, laden Sie den "
+#~ "[[Signaturschlüssel von Tails|tails-signing.key]] herunter und "
+#~ "importieren Sie ihn in Ihren Schlüsselbund. Wenn Sie von einem Tails aus "
+#~ "arbeiten, ist der Signaturschlüssel bereits enthalten.[[!meta title="
+#~ "\"Download and verify\"]] [[!meta stylesheet=\"bootstrap.min\" rel="
+#~ "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+#~ "assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/"
+#~ "inc/stylesheets/dave_2\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#~ "stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title="
+#~ "\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel="
+#~ "\"stylesheet\" title=\"\"]] [[!meta script=\"install/inc/js/dave_2\"]] [[!"
+#~ "meta link=\"https://chrome.google.com/webstore/detail/"
+#~ "gaghffbplpialpoeclgjkkbknblfajdl\" rel=\"chrome-webstore-item\"]] [[!"
+#~ "inline pages=\"install/inc/steps/download_2.inline\" raw=\"yes\" sort="
+#~ "\"age\"]]"
-#. type: Content of: <ol><ul><li>
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Alle ISO-Images sind mit dem gleichen Signaturschlüssel signiert, somit "
+#~ "müssen Sie ihn nur einmal importieren. Dennoch werden Sie jedes mal, wenn "
+#~ "Sie ein neues ISO-Image herunterladen, es erneut verifizieren müssen."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
-"html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Dieser Download des Signaturschlüssels von Tails wird durch HTTPS "
+#~ "geschützt. Dennoch könnten Sie, falls unsere Webseite kompromittiert ist "
+#~ "oder Sie Opfer eines [[Man-in-the-Middle-Angriffs|doc/about/warning#man-"
+#~ "in-the-middle]] sind, einen bösartigen Signaturschlüssel herunterladen."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
-"weboftrust.de.html]]"
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Für zusätzliche Verifizierung <a href=\"#wot\">authentifizieren Sie den "
+#~ "Signaturschlüssel durch das OpenPGP Web of Trust</a>."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
-"compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in Schlüssel "
-"mit Gpg4win"
+#~ msgid "Verify the ISO image"
+#~ msgstr "Das ISO-Image verifizieren"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Wie weiter oben in Schritt 3 beschrieben, bietet diese einfache, mit "
+#~ "HTTPS vergleichbare Verifizierung mit OpenPGP ein Verifizierungsniveau, "
+#~ "welches mit der [[Firefoxerweiterung oder BitTorrent|install/download]] "
+#~ "vergleichbar ist, es sei denn Sie <a href=\"#wot\">authentifizieren den "
+#~ "Signaturschlüssel zusätzlich durch das OpenPGP Web of Trust</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Weitere Literatur zu OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP "
+#~ "Software"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
+#~ "html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
+#~ "weboftrust.de.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
+#~ "compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in "
+#~ "Schlüssel mit Gpg4win"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fa.po b/wiki/src/install/inc/steps/download_2.inline.fa.po
index 6fb0be8..993b0b9 100644
--- a/wiki/src/install/inc/steps/download_2.inline.fa.po
+++ b/wiki/src/install/inc/steps/download_2.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-22 21:59+0100\n"
+"POT-Creation-Date: 2017-11-26 18:57+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"
@@ -30,93 +30,102 @@ msgstr ""
msgid "Direct download"
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>1.</span>Download Tails"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <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 indent"
-"\">Download Tails 3.1 ISO image (1.2 GB)</a>"
+"\"]]\" 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>"
msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid "<a id=\"already-downloaded\">I already downloaded Tails 3.1.</a>"
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"<a>I already downloaded Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]].</a>"
msgstr ""
#. 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>2.</span>Verify your download using your browser"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><p>
msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Lose time if your download is incomplete or broken due to an error during "
"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if our download mirrors have been compromised "
"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if your download is modified on the fly by an "
"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><ol>
msgid "\"\"\"]]"
msgstr ""
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn supported-browser firefox btn btn-primary\">Install <u>Tails "
-"Verification</u> extension</a> <a class=\"install-extension-btn supported-"
-"browser chrome btn btn-primary\">Install <u>Tails Verification</u> "
-"extension</a>"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -137,20 +146,19 @@ msgstr ""
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn firefox btn btn-primary\">Update extension</a> <a class=\"install-"
-"extension-btn chrome btn btn-primary\">Update extension</a>"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid "<u>Tails Verification</u> extension Installed!"
msgstr ""
-#. <a id="verify-download" class="btn btn-primary">
-#. Verify download&hellip;</a>
#. type: Content of: <div><div><div><div><div>
msgid ""
-"<label id=\"verify-download-wrapper\" class=\"btn btn-primary btn-verify\"> "
-"Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
"label>"
msgstr ""
@@ -167,13 +175,6 @@ msgid "<b>Verification failed!</b>"
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\">Please try to "
-"download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
msgstr ""
@@ -201,13 +202,14 @@ msgid "Downloading again is usually enough to fix this problem."
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
+msgid "<b>Verification failed again!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -242,10 +244,19 @@ msgid ""
"these issues."
msgstr ""
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3.</span>Continue installing"
+"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>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -259,52 +270,126 @@ msgid ""
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip verification|debian/usb]]</span> <span class="
-"\"windows\">[[Skip verification|win/usb]]</span> <span class=\"linux"
-"\">[[Skip verification|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
-"verification|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip verification|"
-"mac/dvd]]</span> <span class=\"dvd\">[[Skip verification|dvd]]</span> <span "
-"class=\"vm\">[[Skip verification|doc/advanced_topics/virtualization]]</span> "
-"<span class=\"upgrade-tails\">[[Skip verification|upgrade/tails]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Next: Install <em>Tails Installer</em>|debian/"
-"usb]]</span> <span class=\"windows\">[[Next: Install an intermediary Tails|"
-"win/usb]]</span> <span class=\"linux\">[[Next: Install an intermediary Tails|"
-"linux/usb]]</span> <span class=\"mac-usb\">[[Next: Install an intermediary "
-"Tails|mac/usb]]</span> <span class=\"mac-dvd\">[[Next: Burn a Tails DVD|mac/"
-"dvd]]</span> <span class=\"upgrade-tails\">[[Next: Install an intermediary "
-"Tails|upgrade/tails]]</span> (<span class=\"next-counter\"></span>)"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<span class=\"dvd\">[[Next: Burning Tails on a DVD|dvd]]</span> <span class="
-"\"vm\">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>"
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Windows|install/win/usb]]"
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From other Linux distributions|install/linux/usb]]"
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS by burning a DVD first|install/mac/dvd]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS and the command line|install/mac/usb]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -325,8 +410,8 @@ msgstr ""
#. type: Content of: <div><div><div><ul><li>
msgid ""
-"Chrome and Chromium <span id=\"min-version-chrome\">$MINVER-CHROME</span> "
-"and later (<a href=\"https://www.google.com/chrome/\">Download</a>)"
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><ul><li>
@@ -341,21 +426,59 @@ msgid "Please update your browser to the latest version."
msgstr ""
#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
+msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
#. type: Content of: <div><div><h2>
@@ -389,23 +512,24 @@ msgstr ""
msgid "BitTorrent doesn't work over Tor or in Tails."
msgstr ""
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1.</span>Download Tails (Torrent file)"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary indent"
-"\">Download Tails 3.1 Torrent file</a>"
+"\"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>"
msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2.</span>Verify your download using BitTorrent"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -414,33 +538,21 @@ msgid ""
"complete."
msgstr ""
-#. type: Content of: <h1>
-msgid "Download and verify using OpenPGP"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have <em>GPG</em> installed but might need guidance on "
-"performing the verification."
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <ol><li><p>
-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>)."
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. 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\" "
@@ -448,106 +560,75 @@ msgid ""
"folder where you saved the ISO image."
msgstr ""
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
msgstr ""
-#. type: Content of: <ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "Note that since all Tails releases are signed with the same key, you will "
-#| "not have to verify the key every time and the trust you might "
-#| "progressively build in it will be built once and for all. Still, you will "
-#| "have to check the ISO image every time you download a new one!"
-msgid ""
-"All our ISO images are signed with the same signing key, so you only have to "
-"import it once. Still, you have to verify the ISO image every time you "
-"download a new one."
-msgstr ""
-"توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
-"لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور به "
-"آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که فایل "
-"ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
-
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div><p>
msgid ""
-"This download of the Tails signing key is protected using HTTPS. But you "
-"could still download a malicious signing key if our website is compromised "
-"or if you are victim of a [[man-in-the-middle attack|doc/about/warning#man-"
-"in-the-middle]]."
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div>
msgid ""
-"For additional verification, you can <a href=\"#wot\">authenticate the "
-"signing key through the OpenPGP Web of Trust</a>."
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <h2>
-msgid "Verify the ISO image"
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "This section provides simplified instructions:"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
"span></a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
"a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#tails\">In Tails</a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#command-line\">Using the command line</a>"
msgstr ""
-#. type: Content of: <div><p>
-msgid ""
-"As explained above in step 3, this simple OpenPGP verification provides a "
-"level of verification equivalent to HTTPS, like the [[Firefox extension or "
-"BitTorrent|install/download]], unless you also <a href=\"#wot\">authenticate "
-"the signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"windows\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Windows with <span class=\"application\">Gpg4win</span>"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
"See the [[<span class=\"application\">Gpg4win</span> documentation on "
"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"Verify the date of the signature to make sure that you downloaded the latest "
"version."
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "If the following warning appears:"
msgstr ""
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
#, no-wrap
msgid ""
"Not enough information to check the signature validity.\n"
@@ -555,153 +636,170 @@ msgid ""
"The validity of the signature cannot be verified.\n"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
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>."
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"mac\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr ""
-#. type: Content of: <ol><li>
+#. 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."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
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>."
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"tails\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Tails"
msgstr ""
-#. type: Content of: <ol><li>
+#. 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."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
"With Verify Signature</span>."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid "The verification of the ISO image starts automatically:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"After the verification finishes, click on the notification counter in the "
"bottom-right corner and on the notification with a transparent background on "
"the right of the notification area:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "Using the command line"
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Open a terminal and navigate to the folder where you saved the ISO image and "
"the signature."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "Execute:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "The output of this command should be the following:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "If the output also includes:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: WARNING: This key is not certified with a trusted signature!"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: There is no indication that the signature belongs to the owner."
msgstr ""
-#. type: Content of: <ol>
-msgid "<a id=\"wot\"></a>"
+#. type: Content of: <div><ol>
+msgid "\"\"\"]] <a id=\"wot\"></a>"
msgstr ""
-#. type: Content of: <ol><h2>
+#. type: Content of: <div><ol><h3>
msgid "Authenticate the signing key through the OpenPGP Web of Trust"
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div><ol>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><p>
msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>checksum</em> for the Firefox extension"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Torrent file</em> for BitTorrent"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Tails signing key</em> for the OpenPGP verification"
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
"about/warning#man-in-the-middle]]."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP verification is the only technique that allows you to verify the "
"ISO image even better by also authenticating the Tails signing key through "
@@ -709,7 +807,7 @@ msgid ""
"way to completely protect you from malicious downloads."
msgstr ""
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are verifying an ISO image from inside Tails already, for example to "
"do a manual upgrade, then the Tails signing key is already included in "
@@ -717,7 +815,7 @@ msgid ""
"installation already because you are not downloading it."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "One of the inherent problems of standard HTTPS is that the trust we "
@@ -741,7 +839,7 @@ msgstr ""
"هشدار ما آمده|about/warning#man-in-the-middle]] بارها مشخص شده که در برابر "
"حملات آسیب‌پذیر است"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "We believe instead that users should be given the final say when trusting "
@@ -755,7 +853,7 @@ msgstr ""
"ما در عوض معتقدیم کاربران باید نظر نهایی در مورد اعتماد به یک تارنما را "
"بدهند و اعتماد باید بر مبنای تعاملات انسانی باشد."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
@@ -769,21 +867,21 @@ msgstr ""
"[[!wikipedia Web_of_Trust desc=\"شبکهٔ اعتماد\"]] اُپن‌پی‌جی‌پی یک مدل اعتماد "
"مرکززدایی‌شده بر مبنای کلیدهای اُپن‌پی‌جی‌پی است. بیایید مثالی در این مورد ببینیم."
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
#| "keys.\n"
#| "You're trusting Alice's key.*\n"
msgid ""
-"<em>You are friend with Alice and really trust her way of managing OpenPGP "
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
"keys. So you are trusting Alice's key.</em>"
msgstr ""
"*شما دوست آلیس هستید و واقعاً‌ به نحوهٔ مدیریت کلیدهای اُپن‌پی‌جی‌پی از سوی اعتماد "
"دارید.\n"
"شما به کلید آلیس اعتماد دارید.*\n"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
@@ -796,7 +894,7 @@ msgstr ""
"*همین‌طور آلیس در یک کنفرانس، باب، یک برنامه‌نویس تیلز، را ملاقات\n"
"و کلید باب را امضا کرده است. آلیس به کلید باب اعتماد دارد.*\n"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
@@ -809,7 +907,7 @@ msgstr ""
"*باب یک برنامه‌نویس تیلز است که مستقیماً صاحب یک کلید امضای تیلز است.\n"
"باب به کلید امضای تیلز اعتماد کامل دارد.*\n"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "This scenario creates a trust path from you to Tails signing key that "
@@ -823,7 +921,7 @@ msgstr ""
"اجازه می‌دهد بدون نیاز به اتکا به مراجع صدور گواهی دیجیتال به این کلید اعتماد "
"کنید."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
@@ -834,7 +932,7 @@ msgid ""
"usb]]."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "This trust model is not perfect either and requires both caution and "
@@ -850,7 +948,7 @@ msgstr ""
"کاربران است. جزییات فنی ایجاد و مدیریت کلیدهای اُپن‌پی‌جی‌پی و اعتماد به آن‌ها "
"خارج از حوصلهٔ این سند است."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "Since the Web of Trust is actually based on human relationships and real-"
@@ -869,7 +967,7 @@ msgstr ""
"خودتان و ایجاد روابط اعتماد برای یافتن مسیر اعتماد خود به کلید امضای تیلز "
"است."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
@@ -884,50 +982,61 @@ msgstr ""
"می‌توانید این کار را با تماس گرفتن با علاقه‌مندان محلی تیلز یا [[!wikipedia "
"Linux_User_Group desc=\"%s\"]] و مبادلهٔ کارهای اُپن‌پی‌جی‌پی آن‌ها آغاز کنید."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
-"After you built a trust path, you can certify the Tails signing key by "
+"After you build a trust path, you can certify the Tails signing key by "
"signing it with your own key to get rid of some warnings during the "
"verification process."
msgstr ""
-#. type: Content of: <ol><h2>
-msgid "Further reading on OpenPGP"
-msgstr "منابع مطالعاتی بیشتر در مورد اُپن‌پی‌جی‌پی"
+#, fuzzy
+#~| msgid ""
+#~| "Note that since all Tails releases are signed with the same key, you "
+#~| "will not have to verify the key every time and the trust you might "
+#~| "progressively build in it will be built once and for all. Still, you "
+#~| "will have to check the ISO image every time you download a new one!"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "توجه داشته باشید از آن‌جا که تمام نسخه‌های تیلز با کلید مشابه امضاء شده‌اند "
+#~ "لازم نیست هر بار نیازی به تأیید کلید نیست و اعتمادی که ممکن است به مرور "
+#~ "به آن پیدا کنید، یک بار برای همیشه در دسترس است. با این‌حال باید هر بار که "
+#~ "فایل ایزوی جدید دانلود می‌کنید، آن را بررسی کنید."
-#. type: Content of: <ol><ul><li>
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]]، یک نرم‌افزار آزاد اُپن‌پی‌جی‌پی"
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "منابع مطالعاتی بیشتر در مورد اُپن‌پی‌جی‌پی"
-#. type: Content of: <ol><ul><li>
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[آپاچی: چگونگی استفاده از اُپن‌پی‌جی‌پی|http://www.apache.org/dev/openpgp.html]]"
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]]، یک نرم‌افزار آزاد اُپن‌پی‌جی‌پی"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[دبیان: امضای کلید|http://www.debian.org/events/keysigning]]، آموزش کلیدهای "
-"امضای افراد دیگر"
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[آپاچی: چگونگی استفاده از اُپن‌پی‌جی‌پی|http://www.apache.org/dev/openpgp."
+#~ "html]]"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: توضیح شبکهٔ اعتماد اُپن‌پی‌جی‌پی|http://www.rubin.ch/pgp/weboftrust."
-"en.html]]"
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[دبیان: امضای کلید|http://www.debian.org/events/keysigning]]، آموزش "
+#~ "کلیدهای امضای افراد دیگر"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-compendium_16."
-"html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: توضیح شبکهٔ اعتماد اُپن‌پی‌جی‌پی|http://www.rubin.ch/pgp/"
+#~ "weboftrust.en.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: بازرسی گواهی|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]]، راهنمایی برای مدیریت کلیدها با Gpg4win"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.fr.po b/wiki/src/install/inc/steps/download_2.inline.fr.po
index c0ffd6d..99388c7 100644
--- a/wiki/src/install/inc/steps/download_2.inline.fr.po
+++ b/wiki/src/install/inc/steps/download_2.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-22 21:59+0100\n"
+"POT-Creation-Date: 2017-11-26 18:57+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"
@@ -29,93 +29,118 @@ msgstr ""
msgid "Direct download"
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>1.</span>Download Tails"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
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_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_iso_url\" raw=\"yes\" sort=\"age"
-"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary indent"
-"\">Download Tails 3.1 ISO image (1.2 GB)</a>"
+"\"]]\" 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>"
msgstr ""
+"Téléchargez l'<a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\">image ISO de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]]</a> (<span class=\"remove-extra-space"
+"\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)."
-#. type: Content of: <div><div><div><p>
-msgid "<a id=\"already-downloaded\">I already downloaded Tails 3.1.</a>"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]].</a>"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
#. 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>2.</span>Verify your download using your browser"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><p>
msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Lose time if your download is incomplete or broken due to an error during "
"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if our download mirrors have been compromised "
"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if your download is modified on the fly by an "
"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><ol>
msgid "\"\"\"]]"
msgstr ""
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn supported-browser firefox btn btn-primary\">Install <u>Tails "
-"Verification</u> extension</a> <a class=\"install-extension-btn supported-"
-"browser chrome btn btn-primary\">Install <u>Tails Verification</u> "
-"extension</a>"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -136,20 +161,19 @@ msgstr ""
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn firefox btn btn-primary\">Update extension</a> <a class=\"install-"
-"extension-btn chrome btn btn-primary\">Update extension</a>"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid "<u>Tails Verification</u> extension Installed!"
msgstr ""
-#. <a id="verify-download" class="btn btn-primary">
-#. Verify download&hellip;</a>
#. type: Content of: <div><div><div><div><div>
msgid ""
-"<label id=\"verify-download-wrapper\" class=\"btn btn-primary btn-verify\"> "
-"Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
"label>"
msgstr ""
@@ -166,13 +190,6 @@ msgid "<b>Verification failed!</b>"
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\">Please try to "
-"download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
msgstr ""
@@ -200,13 +217,14 @@ msgid "Downloading again is usually enough to fix this problem."
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
+msgid "<b>Verification failed again!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -241,10 +259,19 @@ msgid ""
"these issues."
msgstr ""
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3.</span>Continue installing"
+"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>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -258,52 +285,126 @@ msgid ""
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip verification|debian/usb]]</span> <span class="
-"\"windows\">[[Skip verification|win/usb]]</span> <span class=\"linux"
-"\">[[Skip verification|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
-"verification|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip verification|"
-"mac/dvd]]</span> <span class=\"dvd\">[[Skip verification|dvd]]</span> <span "
-"class=\"vm\">[[Skip verification|doc/advanced_topics/virtualization]]</span> "
-"<span class=\"upgrade-tails\">[[Skip verification|upgrade/tails]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Next: Install <em>Tails Installer</em>|debian/"
-"usb]]</span> <span class=\"windows\">[[Next: Install an intermediary Tails|"
-"win/usb]]</span> <span class=\"linux\">[[Next: Install an intermediary Tails|"
-"linux/usb]]</span> <span class=\"mac-usb\">[[Next: Install an intermediary "
-"Tails|mac/usb]]</span> <span class=\"mac-dvd\">[[Next: Burn a Tails DVD|mac/"
-"dvd]]</span> <span class=\"upgrade-tails\">[[Next: Install an intermediary "
-"Tails|upgrade/tails]]</span> (<span class=\"next-counter\"></span>)"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<span class=\"dvd\">[[Next: Burning Tails on a DVD|dvd]]</span> <span class="
-"\"vm\">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>"
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Windows|install/win/usb]]"
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From other Linux distributions|install/linux/usb]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS by burning a DVD first|install/mac/dvd]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS and the command line|install/mac/usb]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -324,8 +425,8 @@ msgstr ""
#. type: Content of: <div><div><div><ul><li>
msgid ""
-"Chrome and Chromium <span id=\"min-version-chrome\">$MINVER-CHROME</span> "
-"and later (<a href=\"https://www.google.com/chrome/\">Download</a>)"
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><ul><li>
@@ -340,21 +441,59 @@ msgid "Please update your browser to the latest version."
msgstr ""
#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
#. type: Content of: <div><div><h2>
@@ -388,23 +527,34 @@ msgstr ""
msgid "BitTorrent doesn't work over Tor or in Tails."
msgstr ""
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1.</span>Download Tails (Torrent file)"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <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_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary indent"
-"\">Download Tails 3.1 Torrent file</a>"
+"\"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>"
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/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
+"le dossier où vous avez enregistré l'image ISO."
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2.</span>Verify your download using BitTorrent"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -413,44 +563,21 @@ msgid ""
"complete."
msgstr ""
-#. type: Content of: <h1>
-msgid "Download and verify using OpenPGP"
-msgstr "Télécharger et vérifier avec OpenPGP"
-
-#. type: Content of: <p>
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have <em>GPG</em> installed but might need guidance on "
-"performing the verification."
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-"Ces instructions sont destinées aux personnes étant déjà familières avec "
-"OpenPGP et ayant déjà <em>GPG</em> installé mais pouvant avoir besoin d'aide pour "
-"effectuer la vérification."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-"Si vous n'avez pas l'habitude d'OpenPGP, téléchargez plutôt en utilisant "
-"soit [[notre module complémentaire Firefox soit BitTorrent|install/"
-"download]]."
-#. type: Content of: <ol><li><p>
-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>)."
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr ""
-"Téléchargez l'<a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
-"\"]]' class=\"use-mirror-pool\">image ISO de Tails [[!inline pages=\"inc/"
-"stable_amd64_version\" raw=\"yes\"]]</a> (<span class=\"remove-extra-space"
-"\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
-"span>)."
-#. type: Content of: <ol><li><p>
+#. 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\" "
@@ -462,60 +589,30 @@ msgstr ""
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a> et sauvegardez-la dans "
"le dossier où vous avez enregistré l'image ISO."
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
-msgstr ""
-"Si vous faites cette vérification pour la première fois, téléchargez la "
-"[[clé de signature de Tails|tails-signing.key]] et importez-la dans votre "
-"trousseau de clés. Si vous travaillez depuis Tails, la clé de signature est "
-"déjà inclue."
-
-#. type: Content of: <ol><li><p>
-msgid ""
-"All our ISO images are signed with the same signing key, so you only have to "
-"import it once. Still, you have to verify the ISO image every time you "
-"download a new one."
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
msgstr ""
-"Toutes les images ISO sont signées avec la même clé, vous n'aurez donc à "
-"l'importer qu'une seule fois. Vous devrez quand même vérifier l'image "
-"ISO "
-"chaque fois que vous en téléchargerez une nouvelle."
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div><p>
msgid ""
-"This download of the Tails signing key is protected using HTTPS. But you "
-"could still download a malicious signing key if our website is compromised "
-"or if you are victim of a [[man-in-the-middle attack|doc/about/warning#man-"
-"in-the-middle]]."
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-"Le téléchargement de la clé de signature est protégé par l'utilisation "
-"de HTTPS. "
-"Mais vous pourriez tout de même télécharger une clé malveillante si "
-"notre site web était compromis ou si vous étiez victime d'une attaque de "
-"[[l'homme du "
-"milieu|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div>
msgid ""
-"For additional verification, you can <a href=\"#wot\">authenticate the "
-"signing key through the OpenPGP Web of Trust</a>."
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-"Pour une vérification supplémentaire, vous pouvez <a href=\"#wot"
-"\">authentifier "
-"la clé de signature via la Toile de Confiance OpenPGP</a>."
-
-#. type: Content of: <h2>
-msgid "Verify the ISO image"
-msgstr "Vérifier l'image ISO"
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "This section provides simplified instructions:"
msgstr "Cette section contient des instructions simplifiées :"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
"span></a>"
@@ -523,7 +620,7 @@ msgstr ""
"<a href=\"#windows\">Pour Windows avec <span class=\"application\">Gpg4win</"
"span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
"a>"
@@ -531,48 +628,33 @@ msgstr ""
"<a href=\"#mac\">Pour macOS avec <span class=\"application\">GPGTools</"
"span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#tails\">In Tails</a>"
msgstr "<a href=\"#tails\">Pour Tails</a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#command-line\">Using the command line</a>"
msgstr "<a href=\"#command-line\">En utilisant la ligne de commande</a>"
-#. type: Content of: <div><p>
-msgid ""
-"As explained above in step 3, this simple OpenPGP verification provides a "
-"level of verification equivalent to HTTPS, like the [[Firefox extension or "
-"BitTorrent|install/download]], unless you also <a href=\"#wot\">authenticate "
-"the signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-"Comme expliqué à la troisième étape, cette simple vérification avec "
-"OpenPGP "
-"fournit un niveau de vérification équivalent à HTTPS, comme [[le module "
-"complémentaire pour Firefox ou BitTorrent|install/download]], sauf si vous "
-"<a href=\"#wot\">authentifiez la clé de signature via la Toile de Confiance "
-"OpenPGP</a>."
-
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"windows\"></a>"
msgstr "<a id=\"windows\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Windows with <span class=\"application\">Gpg4win</span>"
msgstr "Pour Windows avec <span class=\"application\">Gpg4win</span>"
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
"See the [[<span class=\"application\">Gpg4win</span> documentation on "
"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
msgstr ""
-"Voir la documentation de [[<span class=\"application\">Gpg4win</span> sur "
-"la "
+"Voir la documentation de [[<span class=\"application\">Gpg4win</span> sur la "
"vérification des signatures|http://www.gpg4win.org/doc/en/gpg4win-"
"compendium_24.html#id4]] (en anglais)."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"Verify the date of the signature to make sure that you downloaded the latest "
"version."
@@ -580,11 +662,12 @@ msgstr ""
"Vérifiez la date de la signature pour vous assurer que vous avez téléchargé "
"la dernière version."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "If the following warning appears:"
msgstr "Si l'avertissement suivant apparaît :"
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
"Not enough information to check the signature validity.\n"
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
@@ -594,7 +677,7 @@ msgstr ""
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
"The validity of the signature cannot be verified.\n"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
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 "
@@ -602,18 +685,17 @@ msgid ""
msgstr ""
"Alors l'image ISO est tout de même correctement signée par la clé que vous "
"avez téléchargé. Pour supprimer cet avertissement vous devez <a href=\"#wot"
-"\">authentifier "
-"la clé de signature via la Toile de Confiance OpenPGP</a>."
+"\">authentifier la clé de signature via la Toile de Confiance OpenPGP</a>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"mac\"></a>"
msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
-#. type: Content of: <ol><li>
+#. 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."
@@ -621,27 +703,25 @@ 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: <ol><li>
+#. type: Content of: <div><ol><li>
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>."
msgstr ""
-"Faites un clic droit sur l'image ISO puis sur "
-"<span class=\"guimenuchoice\"> "
-"<span class=\"guisubmenu\">Services</span> ▸ "
-"<span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></"
-"span>."
+"Faites un clic droit sur l'image ISO puis sur <span class=\"guimenuchoice\"> "
+"<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+"\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"tails\"></a>"
msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Tails"
msgstr "Pour Tails"
-#. type: Content of: <ol><li>
+#. 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."
@@ -649,7 +729,7 @@ msgstr ""
"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
"enregistré l'image ISO et la signature."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
"With Verify Signature</span>."
@@ -657,15 +737,15 @@ msgstr ""
"Faites un clic droit sur la signature puis sur <span class=\"guimenuitem"
"\">Ouvrir avec Vérifier la signature</span>."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid "The verification of the ISO image starts automatically:"
msgstr "La vérification de l'image ISO démarre automatiquement :"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"After the verification finishes, click on the notification counter in the "
"bottom-right corner and on the notification with a transparent background on "
@@ -675,19 +755,19 @@ msgstr ""
"dans l'angle en bas à droite puis sur la notification avec un fond "
"transparent à droite de la zone de notification :"
-#. type: Content of: <ol><li><p>
+#. 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\"]]"
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
msgstr "<a id=\"command-line\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "Using the command line"
msgstr "En ligne de commande"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Open a terminal and navigate to the folder where you saved the ISO image and "
"the signature."
@@ -695,81 +775,112 @@ msgstr ""
"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
"l'image ISO et la signature."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "Execute:"
msgstr "Exécutez la commande :"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "The output of this command should be the following:"
msgstr "La sortie de cette commande devrait être :"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
msgstr ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "If the output also includes:"
msgstr "Si la sortie inclut aussi :"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: WARNING: This key is not certified with a trusted signature!"
msgstr "gpg: WARNING: This key is not certified with a trusted signature!"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: There is no indication that the signature belongs to the owner."
-msgstr "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: There is no indication that the signature belongs to the owner."
-#. type: Content of: <ol>
-msgid "<a id=\"wot\"></a>"
+#. type: Content of: <div><ol>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
msgstr "<a id=\"wot\"></a>"
-#. type: Content of: <ol><h2>
+#. type: Content of: <div><ol><h3>
msgid "Authenticate the signing key through the OpenPGP Web of Trust"
msgstr "Authentifier la clé de signature via la Toile de Confiance OpenPGP"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div><ol>
msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
+msgid ""
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
"Les techniques de vérifications présentées jusqu'à maintenant ([[le module "
"complémentaire pour Firefox, BitTorrent|install/download]] et la "
"vérification OpenPGP) dépendent toutes d'informations téléchargées de "
"manière sécurisée via HTTPS depuis notre site web :"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>checksum</em> for the Firefox extension"
msgstr "La <em>somme de contrôle</em> pour l'extension Firefox"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Torrent file</em> for BitTorrent"
msgstr "Le <em>fichier Torrent</em> pour BitTorrent"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Tails signing key</em> for the OpenPGP verification"
msgstr "La <em>clé de signature de Tails</em> pour la vérification OpenPGP"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
msgid ""
"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
"about/warning#man-in-the-middle]]."
msgstr ""
"Mais, si notre site web était compromis ou que vous étiez victime d'une "
"[[attaque de l'homme du milieu|doc/about/warning#man-in-the-middle]] vous "
"pourriez télécharger des informations malveillantes."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP verification is the only technique that allows you to verify the "
"ISO image even better by also authenticating the Tails signing key through "
@@ -782,20 +893,18 @@ msgstr ""
"Toile de Confiance OpenPGP est la seule manière de vous protéger "
"complètement des téléchargements malveillants."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are verifying an ISO image from inside Tails already, for example to "
"do a manual upgrade, then the Tails signing key is already included in "
"Tails. You can trust this signing key as much as you are trusting your Tails "
"installation already because you are not downloading it."
msgstr ""
-"Si vous vérifiez l'image ISO depuis Tails, par "
-"exemple pour faire une mise à jour manuelle, la clé de signature de Tails "
-"est déjà "
-"fournie. Vous pouvez avoir confiance en cette clé autant qu'en votre "
-"installation de Tails."
+"Si vous vérifiez l'image ISO depuis Tails, par exemple pour faire une mise à "
+"jour manuelle, la clé de signature de Tails est déjà fournie. Vous pouvez "
+"avoir confiance en cette clé autant qu'en votre installation de Tails."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"One of the inherent problems of standard HTTPS is that the trust we usually "
"put in a website is defined by certificate authorities: a hierarchical and "
@@ -813,7 +922,7 @@ msgstr ""
"certaines attaques [[comme expliqué dans notre page d'avertissements|doc/"
"about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"We believe that, instead, users should be given the final say when trusting "
"a website, and that designation of trust should be done on the basis of "
@@ -823,7 +932,7 @@ msgstr ""
"à un site web, doit revenir aux individus et que la construction de la "
"confiance devrait être basée sur des relations humaines."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
"on OpenPGP keys that can help solving this problem. Let's see this with an "
@@ -833,15 +942,20 @@ msgstr ""
"est un modèle de confiance décentralisé basé sur les clés OpenPGP. Voyons ça "
"avec un exemple :"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
msgid ""
-"<em>You are friend with Alice and really trust her way of managing OpenPGP "
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
"keys. So you are trusting Alice's key.</em>"
msgstr ""
"<em>Vous êtes un ami d'Alice et lui faites vraiment confiance quant à sa "
-"manière de gérer les clés OpenPGP. Vous avez confiance dans la clé d'Alice.</em>"
+"manière de gérer les clés OpenPGP. Vous avez confiance dans la clé d'Alice.</"
+"em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
"certified Bob's key. So Alice is trusting Bob's key.</em>"
@@ -849,15 +963,15 @@ msgstr ""
"<em>De plus, Alice a rencontré Bob, un développeur de Tails, lors d'une "
"conférence et a signé sa clé. Alice a confiance dans la clé de Bob.</em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
"fully trusts the Tails signing key.</em>"
msgstr ""
-"<em>Bob est un développeur de Tails qui possède la clé de signature de Tails. "
-"Bob a pleinement confiance dans la clé de signature de Tails.</em>"
+"<em>Bob est un développeur de Tails qui possède la clé de signature de "
+"Tails. Bob a pleinement confiance dans la clé de signature de Tails.</em>"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"In this scenario, Alice found a path to trust the Tails signing key without "
"the need to rely on certificate authorities."
@@ -865,7 +979,7 @@ msgstr ""
"Dans ce scénario, Alice a trouvé un chemin de confiance jusqu'à la clé de "
"signature de Tails sans avoir besoin d'autorités de certification."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
@@ -876,17 +990,14 @@ msgid ""
"usb]]."
msgstr ""
"Si vous utilisez Debian, Ubuntu ou Linux Mint, vous pouvez installer le "
-"paquet <code>debian-keyring</code> qui contient les clés OpenPGP de tous "
-"les "
+"paquet <code>debian-keyring</code> qui contient les clés OpenPGP de tous les "
"développeurs Debian. Certains développeurs Debian ont certifié la clé de "
-"signature "
-"de Tails, vous pouvez donc utiliser ces certifications pour construire un "
-"chemin de confiance. "
-"Cette méthode est expliquée en détail dans nos instructions sur "
-"[[installer Tails depuis Debian, Ubuntu ou Linux Mint en ligne "
-"de commande|install/expert/usb]]."
+"signature de Tails, vous pouvez donc utiliser ces certifications pour "
+"construire un chemin de confiance. Cette méthode est expliquée en détail "
+"dans nos instructions sur [[installer Tails depuis Debian, Ubuntu ou Linux "
+"Mint en ligne de commande|install/expert/usb]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Relying on the Web of Trust requires both caution and intelligent "
"supervision by the users. The technical details are outside of the scope of "
@@ -896,7 +1007,7 @@ msgstr ""
"de la part des personnes l'utilisant. Les détails techniques sont au-delà de "
"la portée de ce document."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Since the Web of Trust is actually based on human relationships and real-"
"life interactions, the best is to get in touch with people knowledgeable "
@@ -909,7 +1020,7 @@ msgstr ""
"afin de vous frayer votre propre chemin de confiance jusqu'à la clé de "
"signature de Tails."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"For example, you can start by contacting a local [[!wikipedia "
"Linux_User_Group]], [[an organization offering Tails training|support/"
@@ -921,58 +1032,127 @@ msgstr ""
"propos de Tails|support/learn]] ou d'autres amis de Tails proches de chez "
"vous et échanger à propos de leurs pratiques d'OpenPGP."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
msgid ""
-"After you built a trust path, you can certify the Tails signing key by "
+"After you build a trust path, you can certify the Tails signing key by "
"signing it with your own key to get rid of some warnings during the "
"verification process."
msgstr ""
-"Après avoir construit un chemin de confiance, vous pouvez certifier la "
-"clé de signature Tails "
-"en la signant avec votre propre clé pour vous débarrasser des avertissements "
-"durant le "
-"processus de vérification."
+"Après avoir construit un chemin de confiance, vous pouvez certifier la clé "
+"de signature Tails en la signant avec votre propre clé pour vous débarrasser "
+"des avertissements durant le processus de vérification."
-#. type: Content of: <ol><h2>
-msgid "Further reading on OpenPGP"
-msgstr "En lire plus à propos de OpenPGP"
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Télécharger et vérifier avec OpenPGP"
-#. type: Content of: <ol><ul><li>
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia_fr GNU_Privacy_Guard desc=\"Wikipédia : GnuPG\"]], un logiciel "
-"OpenPGP libre"
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Ces instructions sont destinées aux personnes étant déjà familières avec "
+#~ "OpenPGP et ayant déjà <em>GPG</em> installé mais pouvant avoir besoin "
+#~ "d'aide pour effectuer la vérification."
-#. type: Content of: <ol><ul><li>
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (en "
-"anglais)"
+#~ msgid ""
+#~ "If you are not familiar with OpenPGP, download using either [[our Firefox "
+#~ "extension or BitTorrent|install/download]] instead."
+#~ msgstr ""
+#~ "Si vous n'avez pas l'habitude d'OpenPGP, téléchargez plutôt en utilisant "
+#~ "soit [[notre module complémentaire Firefox soit BitTorrent|install/"
+#~ "download]]."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian : Signature de clés|http://www.debian.org/events/keysigning.fr."
-"html]], un tutoriel sur le fait de signer les clés d'autres personnes"
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Si vous faites cette vérification pour la première fois, téléchargez la "
+#~ "[[clé de signature de Tails|tails-signing.key]] et importez-la dans votre "
+#~ "trousseau de clés. Si vous travaillez depuis Tails, la clé de signature "
+#~ "est déjà inclue."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]] (en anglais)"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Toutes les images ISO sont signées avec la même clé, vous n'aurez donc à "
+#~ "l'importer qu'une seule fois. Vous devrez quand même vérifier l'image ISO "
+#~ "chaque fois que vous en téléchargerez une nouvelle."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions en anglais pour la gestion de la "
-"confiance des clés avec Gpg4win"
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Le téléchargement de la clé de signature est protégé par l'utilisation de "
+#~ "HTTPS. Mais vous pourriez tout de même télécharger une clé malveillante "
+#~ "si notre site web était compromis ou si vous étiez victime d'une attaque "
+#~ "de [[l'homme du milieu|doc/about/warning#man-in-the-middle]]."
+
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Pour une vérification supplémentaire, vous pouvez <a href=\"#wot"
+#~ "\">authentifier la clé de signature via la Toile de Confiance OpenPGP</a>."
+
+#~ msgid "Verify the ISO image"
+#~ msgstr "Vérifier l'image ISO"
+
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Comme expliqué à la troisième étape, cette simple vérification avec "
+#~ "OpenPGP fournit un niveau de vérification équivalent à HTTPS, comme [[le "
+#~ "module complémentaire pour Firefox ou BitTorrent|install/download]], sauf "
+#~ "si vous <a href=\"#wot\">authentifiez la clé de signature via la Toile de "
+#~ "Confiance OpenPGP</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "En lire plus à propos de OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia_fr GNU_Privacy_Guard desc=\"Wikipédia : GnuPG\"]], un "
+#~ "logiciel OpenPGP libre"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (en "
+#~ "anglais)"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian : Signature de clés|http://www.debian.org/events/keysigning.fr."
+#~ "html]], un tutoriel sur le fait de signer les clés d'autres personnes"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]] (en anglais)"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions en anglais pour la gestion de la "
+#~ "confiance des clés avec Gpg4win"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.it.po b/wiki/src/install/inc/steps/download_2.inline.it.po
index a6f894f..e4e41a1 100644
--- a/wiki/src/install/inc/steps/download_2.inline.it.po
+++ b/wiki/src/install/inc/steps/download_2.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-22 21:59+0100\n"
+"POT-Creation-Date: 2017-11-26 18:57+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"
@@ -30,93 +30,118 @@ msgstr ""
msgid "Direct download"
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>1.</span>Download Tails"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
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_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_iso_url\" raw=\"yes\" sort=\"age"
-"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary indent"
-"\">Download Tails 3.1 ISO image (1.2 GB)</a>"
+"\"]]\" 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>"
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><p>
-msgid "<a id=\"already-downloaded\">I already downloaded Tails 3.1.</a>"
+#. type: Content of: <div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"<a>I already downloaded Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]].</a>"
msgstr ""
+"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
#. 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>2.</span>Verify your download using your browser"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><p>
msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Lose time if your download is incomplete or broken due to an error during "
"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if our download mirrors have been compromised "
"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if your download is modified on the fly by an "
"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><ol>
msgid "\"\"\"]]"
msgstr ""
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn supported-browser firefox btn btn-primary\">Install <u>Tails "
-"Verification</u> extension</a> <a class=\"install-extension-btn supported-"
-"browser chrome btn btn-primary\">Install <u>Tails Verification</u> "
-"extension</a>"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -137,20 +162,19 @@ msgstr ""
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn firefox btn btn-primary\">Update extension</a> <a class=\"install-"
-"extension-btn chrome btn btn-primary\">Update extension</a>"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid "<u>Tails Verification</u> extension Installed!"
msgstr ""
-#. <a id="verify-download" class="btn btn-primary">
-#. Verify download&hellip;</a>
#. type: Content of: <div><div><div><div><div>
msgid ""
-"<label id=\"verify-download-wrapper\" class=\"btn btn-primary btn-verify\"> "
-"Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
"label>"
msgstr ""
@@ -167,13 +191,6 @@ msgid "<b>Verification failed!</b>"
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\">Please try to "
-"download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
msgstr ""
@@ -201,13 +218,14 @@ msgid "Downloading again is usually enough to fix this problem."
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
+msgid "<b>Verification failed again!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -242,10 +260,19 @@ msgid ""
"these issues."
msgstr ""
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3.</span>Continue installing"
+"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>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -259,52 +286,126 @@ msgid ""
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip verification|debian/usb]]</span> <span class="
-"\"windows\">[[Skip verification|win/usb]]</span> <span class=\"linux"
-"\">[[Skip verification|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
-"verification|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip verification|"
-"mac/dvd]]</span> <span class=\"dvd\">[[Skip verification|dvd]]</span> <span "
-"class=\"vm\">[[Skip verification|doc/advanced_topics/virtualization]]</span> "
-"<span class=\"upgrade-tails\">[[Skip verification|upgrade/tails]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Next: Install <em>Tails Installer</em>|debian/"
-"usb]]</span> <span class=\"windows\">[[Next: Install an intermediary Tails|"
-"win/usb]]</span> <span class=\"linux\">[[Next: Install an intermediary Tails|"
-"linux/usb]]</span> <span class=\"mac-usb\">[[Next: Install an intermediary "
-"Tails|mac/usb]]</span> <span class=\"mac-dvd\">[[Next: Burn a Tails DVD|mac/"
-"dvd]]</span> <span class=\"upgrade-tails\">[[Next: Install an intermediary "
-"Tails|upgrade/tails]]</span> (<span class=\"next-counter\"></span>)"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<span class=\"dvd\">[[Next: Burning Tails on a DVD|dvd]]</span> <span class="
-"\"vm\">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>"
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Windows|install/win/usb]]"
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From other Linux distributions|install/linux/usb]]"
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS by burning a DVD first|install/mac/dvd]]"
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS and the command line|install/mac/usb]]"
+msgid "[[Burn on a DVD|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -325,8 +426,8 @@ msgstr ""
#. type: Content of: <div><div><div><ul><li>
msgid ""
-"Chrome and Chromium <span id=\"min-version-chrome\">$MINVER-CHROME</span> "
-"and later (<a href=\"https://www.google.com/chrome/\">Download</a>)"
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><ul><li>
@@ -341,21 +442,59 @@ msgid "Please update your browser to the latest version."
msgstr ""
#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
#. type: Content of: <div><div><h2>
@@ -389,23 +528,35 @@ msgstr ""
msgid "BitTorrent doesn't work over Tor or in Tails."
msgstr ""
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1.</span>Download Tails (Torrent file)"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <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_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary indent"
-"\">Download Tails 3.1 Torrent file</a>"
+"\"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>"
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><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2.</span>Verify your download using BitTorrent"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -414,41 +565,21 @@ msgid ""
"complete."
msgstr ""
-#. type: Content of: <h1>
-msgid "Download and verify using OpenPGP"
-msgstr "Scarica e verifica usando OpenPGP"
-
-#. type: Content of: <p>
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have <em>GPG</em> installed but might need guidance on "
-"performing the verification."
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-"Queste istruzioni sono per persone che sono già familiari con un uso base di "
-"OpenPGP e hanno <em>GPG</em> installato, ma potrebbero avere necessità di una guida "
-"per effettuare la verifica."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <ol><li><p>
-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>)."
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
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: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -467,55 +598,30 @@ msgstr ""
"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: <ol><li><p>
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
msgstr ""
-"Se stai facendo la verifica per la prima volta, scarica la [[chiave di "
-"firma Tails|tails-signing.key]] e importala nel tuo portachiavi. Se stai "
-"lavorando da Tails, la chiave di firma è già inclusa."
-#. type: Content of: <ol><li><p>
-msgid ""
-"All our ISO images are signed with the same signing key, so you only have to "
-"import it once. Still, you have to verify the ISO image every time you "
-"download a new one."
-msgstr ""
-"Tutte le immagini ISO sono firmate con la stessa chiave, quindi devi "
-"importarla solo una volta. In ogni caso, devi verificare l'immagine ISO "
-"ogni volta in cui ne scarichi una nuova."
-
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div><p>
msgid ""
-"This download of the Tails signing key is protected using HTTPS. But you "
-"could still download a malicious signing key if our website is compromised "
-"or if you are victim of a [[man-in-the-middle attack|doc/about/warning#man-"
-"in-the-middle]]."
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-"Questo download della chiave di firma Tails è protetto usato HTTPS. "
-"Ma potresti comunque scaricare una chiave di firma maligna se il tuo sito "
-"compromesso o se sei vittima di un [[attacco "
-"man-in-the-middle|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div>
msgid ""
-"For additional verification, you can <a href=\"#wot\">authenticate the "
-"signing key through the OpenPGP Web of Trust</a>."
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-"Per verifiche aggiuntive, puoi <a href=\"#wot\">autenticare "
-"la chiave di firma attraverso la Web of Trust di OpenPGP</a>."
-
-#. type: Content of: <h2>
-msgid "Verify the ISO image"
-msgstr "Verificare l'immagine ISO"
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "This section provides simplified instructions:"
msgstr "Questa sezione fornisce istruzioni semplificate:"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
"span></a>"
@@ -523,55 +629,40 @@ msgstr ""
"<a href=\"#windows\">In Windows con <span class=\"application\">Gpg4win</"
"span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
"a>"
msgstr ""
"<a href=\"#mac\">In macOS con <span class=\"application\">GPGTools</span></a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#tails\">In Tails</a>"
msgstr "<a href=\"#tails\">In Tails</a>"
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#command-line\">Using the command line</a>"
msgstr "<a href=\"#command-line\">Usando la riga di comando</a>"
-#. type: Content of: <div><p>
-msgid ""
-"As explained above in step 3, this simple OpenPGP verification provides a "
-"level of verification equivalent to HTTPS, like the [[Firefox extension or "
-"BitTorrent|install/download]], unless you also <a href=\"#wot\">authenticate "
-"the signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-"Come spiegato precedentemente al passaggio 3, questa semplice verica "
-"OpenPGP "
-"fornisce un livello di verifica equivalente all'HTTPS, come un'[[estensione "
-"Firefox o BitTorrent|install/download]], a meno che tu non "
-"<a href=\"#wot\">autentichi la chiave di firma utilizzando la Web of Trust "
-"OpenPGP</a>."
-
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"windows\"></a>"
msgstr "<a id=\"windows\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Windows with <span class=\"application\">Gpg4win</span>"
msgstr "In Windows con <span class=\"application\">Gpg4win</span>"
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
"See the [[<span class=\"application\">Gpg4win</span> documentation on "
"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
msgstr ""
"Guarda la documentazione [[<span class=\"application\">Gpg4win</span> su "
-"come "
-"verificare le firme|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
+"come verificare le firme|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"Verify the date of the signature to make sure that you downloaded the latest "
"version."
@@ -579,11 +670,12 @@ msgstr ""
"Verifica la data della firma per essere certa che hai scaricato l'ultima "
"versione."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "If the following warning appears:"
msgstr "Se compare il seguente avviso:"
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
+#, no-wrap
msgid ""
"Not enough information to check the signature validity.\n"
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
@@ -593,27 +685,25 @@ msgstr ""
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
"The validity of the signature cannot be verified.\n"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
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>."
msgstr ""
"Significa che l'immagine ISO è ancora corretta secondo la chiave di firma "
-"che "
-"hai scaricato. Per rimuovere questo avviso devi <a href=\"#wot\">autenticare "
-"la "
-"chiave di firma attraverso la Web of Trust OpenPGP</a>."
+"che hai scaricato. Per rimuovere questo avviso devi <a href=\"#wot"
+"\">autenticare la chiave di firma attraverso la Web of Trust OpenPGP</a>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"mac\"></a>"
msgstr "<a id=\"mac\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
-#. type: Content of: <ol><li>
+#. 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."
@@ -621,27 +711,25 @@ msgstr ""
"Apri il <span class=\"application\">Finder</span> e naviga nella cartella "
"dove hai salvato l'immagine ISO e la firma."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
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>."
msgstr ""
-"1. Clicca con il tasto destro sull'immagine ISO e scegli "
-" <span class=\"guimenuchoice\"> "
-" <span class=\"guisubmenu\">Services</span> ▸ "
-" <span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></"
-"span>."
+"1. Clicca con il tasto destro sull'immagine ISO e scegli <span class="
+"\"guimenuchoice\"> <span class=\"guisubmenu\">Services</span> ▸ "
+"<span class=\"guimenuitem\">OpenPGP: Verify Signature of File</span></span>."
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"tails\"></a>"
msgstr "<a id=\"tails\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Tails"
msgstr "Su Tails"
-#. type: Content of: <ol><li>
+#. 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."
@@ -649,7 +737,7 @@ msgstr ""
"Apri il navigatore di file e arriva nella cartella dove hai salvato "
"l'immagine ISO e la firma."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
"With Verify Signature</span>."
@@ -657,15 +745,15 @@ msgstr ""
"Clicca con il tasto destro sulla firma e scegli <span class=\"guimenuitem"
"\">Open With Verify Signature</span>."
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid "The verification of the ISO image starts automatically:"
msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"After the verification finishes, click on the notification counter in the "
"bottom-right corner and on the notification with a transparent background on "
@@ -675,19 +763,19 @@ msgstr ""
"nell'angolo in basso a destra e sulla notifica con uno sfondo trasparente "
"sulla destra dell'area di notifica:"
-#. type: Content of: <ol><li><p>
+#. 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\"]]"
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
msgstr "<a id=\"riga di comando\"></a>"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "Using the command line"
msgstr "Usare la riga di comando"
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Open a terminal and navigate to the folder where you saved the ISO image and "
"the signature."
@@ -695,81 +783,112 @@ msgstr ""
"Apri un terminale e naviga nella cartella dove hai salvato l'immagine ISO e "
"la firma."
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "Execute:"
msgstr "Esegui:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "The output of this command should be the following:"
msgstr "L'output di questo comando dovrebbe essere il seguente:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
msgstr ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
+"\"age\"]]"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "If the output also includes:"
msgstr "Se l'output include anche:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: WARNING: This key is not certified with a trusted signature!"
msgstr "gpg: WARNING: This key is not certified with a trusted signature!"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: There is no indication that the signature belongs to the owner."
-msgstr "gpg: There is no indication that the signature belongs to the owner."
+msgstr ""
+"gpg: There is no indication that the signature belongs to the owner."
-#. type: Content of: <ol>
-msgid "<a id=\"wot\"></a>"
+#. type: Content of: <div><ol>
+#, fuzzy
+#| msgid "<a id=\"wot\"></a>"
+msgid "\"\"\"]] <a id=\"wot\"></a>"
msgstr "<a id=\"wot\"></a>"
-#. type: Content of: <ol><h2>
+#. type: Content of: <div><ol><h3>
msgid "Authenticate the signing key through the OpenPGP Web of Trust"
msgstr "Autenticare la chiave di firma attraverso la Web of Trust OpenPGP"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div><ol>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "The verification techniques presented until now ([[Firefox extension, "
+#| "BitTorrent|install/download]], or OpenPGP verification) all rely on some "
+#| "information being securely downloaded using HTTPS from our website:"
msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
"Le tecniche di verifica presentate fino a ora ([[Firefox extension, "
"BitTorrent|install/download]], o verifica OpenPGP) si basano tutte sul'aver "
"scaricato alcune informazioni dal nostro sito in maniera sicura utilizzando "
"HTTPS:"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>checksum</em> for the Firefox extension"
msgstr "La <em>checksum</em> per l'estensione Firefox"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Torrent file</em> for BitTorrent"
msgstr "Il <em>file Torrent</em> per BitTorrent"
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Tails signing key</em> for the OpenPGP verification"
msgstr "La <em>chiave di firma Tails</em> per la verifica OpenPGP"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+#, fuzzy
+#| msgid ""
+#| "But, while doing so, you could download malicious information if our "
+#| "website is compromised or if you are victim of a [[man-in-the-middle "
+#| "attack|doc/about/warning#man-in-the-middle]]."
msgid ""
"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
"about/warning#man-in-the-middle]]."
msgstr ""
"Ma, facendo una di queste cose, potresti scaricare informazioni malevole se "
"il nostro sito è stato compromesso o se sei vittima di un attacco [[man-in-"
"the-middle attack|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP verification is the only technique that allows you to verify the "
"ISO image even better by also authenticating the Tails signing key through "
@@ -781,21 +900,19 @@ msgstr ""
"firma Tails tramite la Web of Trust OpenPGP. Affidarsi alla Web of Trust "
"OpenPGP è l'unico modo per proteggerti completamente da download malevoli."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are verifying an ISO image from inside Tails already, for example to "
"do a manual upgrade, then the Tails signing key is already included in "
"Tails. You can trust this signing key as much as you are trusting your Tails "
"installation already because you are not downloading it."
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 in Tails. Puoi avere fiducia in questa chiave di firma tanto quanto "
-"hai già fiducia "
-"nella tua installazione Tails, perché non lo stai scaricando."
+"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 "
+"in Tails. Puoi avere fiducia in questa chiave di firma tanto quanto hai già "
+"fiducia nella tua installazione Tails, perché non lo stai scaricando."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"One of the inherent problems of standard HTTPS is that the trust we usually "
"put in a website is defined by certificate authorities: a hierarchical and "
@@ -811,7 +928,7 @@ msgstr ""
"tempo e si è dimostrato svariate volte vulnerabile agli attacchi, [[come "
"spiegato nella nostra pagina di avviso|doc/about/warning#man-in-the-middle]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"We believe that, instead, users should be given the final say when trusting "
"a website, and that designation of trust should be done on the basis of "
@@ -821,7 +938,7 @@ msgstr ""
"sulla fiducia verso un sito internet, e che la fiducia vada riposta sulla "
"base di interazioni umane."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP [[!wikipedia Web_of_Trust]] is a decentralized trust model based "
"on OpenPGP keys that can help solving this problem. Let's see this with an "
@@ -831,31 +948,37 @@ msgstr ""
"decentralizzato basato su chiavi OpenPGP che possono aiutare a risolvere "
"questo problema. Vediamolo con un esempio:"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<em>You are friend with Alice and really trust her way of managing "
+#| "OpenPGP keys. So you are trusting Alice's key.</em>"
msgid ""
-"<em>You are friend with Alice and really trust her way of managing OpenPGP "
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
"keys. So you are trusting Alice's key.</em>"
msgstr ""
"<em>Sei amica di Alice e hai fiducia nel modo in cui gestisce le chiavi "
"OpenPGP. Quindi di fidi della chiave di Alice.</em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Furthermore, Alice met Bob, a Tails developer, in a conference and "
"certified Bob's key. So Alice is trusting Bob's key.</em>"
msgstr ""
-"<em>Inoltre, Alice incontra Bob, uno sviluppatore di Tails, in una conferenza e "
-"certifica la sua chiave. Quindi Alice ha fiducia nella chiave di Bob.</em>"
+"<em>Inoltre, Alice incontra Bob, uno sviluppatore di Tails, in una "
+"conferenza e certifica la sua chiave. Quindi Alice ha fiducia nella chiave "
+"di Bob.</em>"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
msgid ""
"<em>Bob is a Tails developer who directly owns the Tails signing key. So Bob "
"fully trusts the Tails signing key.</em>"
msgstr ""
"<em>Bob è uno sviluppatore di Tails che possiede direttamente le chiavi di "
-"firma di Tails. Quindi Bob si fida pienamente delle chiavi di firma di Tails.</em>"
+"firma di Tails. Quindi Bob si fida pienamente delle chiavi di firma di Tails."
+"</em>"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"In this scenario, Alice found a path to trust the Tails signing key without "
"the need to rely on certificate authorities."
@@ -863,7 +986,7 @@ msgstr ""
"In questo scenario, Alice ha trovato un sentiero di fiducia nella chiave di "
"firma Tails senza il bisogno di affidarsi ad autorità certificate."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
@@ -873,18 +996,15 @@ msgid ""
"from Debian, Ubuntu, or Linux Mint using the command line|install/expert/"
"usb]]."
msgstr ""
-"Se sei su Debian o Ubuntu, puoi installare il "
-"pacchetto <code>debian-keyring</code> che contiene le chiavi OpenPGP di "
-"tutti gli sviluppatori Debian. Alcuni sviluppatori Debian hanno certificato "
-"la chiave "
-"di firma di Tails e puoi usare queste certificazioni per costruire un "
-"sentiero di fiducia "
-"This technique is explained in detail in our instructions on "
-"Questa tecnica è spiegata in dettaglio nelle nostre istruzioni su "
-"[[installare Tails from Debian or Ubuntu usando la riga di "
-"comando|install/expert/usb]]."
+"Se sei su Debian o Ubuntu, puoi installare il pacchetto <code>debian-"
+"keyring</code> che contiene le chiavi OpenPGP di tutti gli sviluppatori "
+"Debian. Alcuni sviluppatori Debian hanno certificato la chiave di firma di "
+"Tails e puoi usare queste certificazioni per costruire un sentiero di "
+"fiducia This technique is explained in detail in our instructions on Questa "
+"tecnica è spiegata in dettaglio nelle nostre istruzioni su [[installare "
+"Tails from Debian or Ubuntu usando la riga di comando|install/expert/usb]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Relying on the Web of Trust requires both caution and intelligent "
"supervision by the users. The technical details are outside of the scope of "
@@ -894,7 +1014,7 @@ msgstr ""
"intelligente da parte degli utilizzatori. I dettagli tecnici sono al di "
"fuori degli scopi di questo documento."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"Since the Web of Trust is actually based on human relationships and real-"
"life interactions, the best is to get in touch with people knowledgeable "
@@ -906,7 +1026,7 @@ msgstr ""
"conoscenza di OpenPGP e costruire con loro relazioni per trovare la tua rete "
"di fiducia nella chiave di firma Tails."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"For example, you can start by contacting a local [[!wikipedia "
"Linux_User_Group]], [[an organization offering Tails training|support/"
@@ -918,54 +1038,115 @@ msgstr ""
"entusiasti di Tails vicino a te e scambiare informazioni sulle loro pratiche "
"OpenPGP."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
+#, fuzzy
+#| msgid ""
+#| "After you built a trust path, you can certify the Tails signing key by "
+#| "signing it with your own key to get rid of some warnings during the "
+#| "verification process."
msgid ""
-"After you built a trust path, you can certify the Tails signing key by "
+"After you build a trust path, you can certify the Tails signing key by "
"signing it with your own key to get rid of some warnings during the "
"verification process."
msgstr ""
"Una volta che hai stabilito un sentiero di fiducia, puoi certificare la "
-"chiave di firma di Tails "
-"firmandola con la tua stessa chiave per liberarti di alcuni degli "
-"avvertimenti duranta il "
-"processo di verifica."
+"chiave di firma di Tails firmandola con la tua stessa chiave per liberarti "
+"di alcuni degli avvertimenti duranta il processo di verifica."
+
+#~ msgid "Download and verify using OpenPGP"
+#~ msgstr "Scarica e verifica usando OpenPGP"
+
+#~ msgid ""
+#~ "These instructions are for people who are already familiar with basic "
+#~ "usage of OpenPGP and have <em>GPG</em> installed but might need guidance "
+#~ "on performing the verification."
+#~ msgstr ""
+#~ "Queste istruzioni sono per persone che sono già familiari con un uso base "
+#~ "di OpenPGP e hanno <em>GPG</em> installato, ma potrebbero avere necessità "
+#~ "di una guida per effettuare la verifica."
-#. type: Content of: <ol><h2>
-msgid "Further reading on OpenPGP"
-msgstr "Altre letture su OpenPGP"
+#~ msgid ""
+#~ "If you are doing the verification for the first time, download the "
+#~ "[[Tails signing key|tails-signing.key]] and import it in your keyring. "
+#~ "If you are working from Tails, the signing key is already included."
+#~ msgstr ""
+#~ "Se stai facendo la verifica per la prima volta, scarica la [[chiave di "
+#~ "firma Tails|tails-signing.key]] e importala nel tuo portachiavi. Se stai "
+#~ "lavorando da Tails, la chiave di firma è già inclusa."
-#. type: Content of: <ol><ul><li>
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], un software OpenPGP free"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Tutte le immagini ISO sono firmate con la stessa chiave, quindi devi "
+#~ "importarla solo una volta. In ogni caso, devi verificare l'immagine ISO "
+#~ "ogni volta in cui ne scarichi una nuova."
-#. type: Content of: <ol><ul><li>
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgid ""
+#~ "This download of the Tails signing key is protected using HTTPS. But you "
+#~ "could still download a malicious signing key if our website is "
+#~ "compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+#~ "about/warning#man-in-the-middle]]."
+#~ msgstr ""
+#~ "Questo download della chiave di firma Tails è protetto usato HTTPS. Ma "
+#~ "potresti comunque scaricare una chiave di firma maligna se il tuo sito "
+#~ "compromesso o se sei vittima di un [[attacco man-in-the-middle|doc/about/"
+#~ "warning#man-in-the-middle]]."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], un tutorial "
-"sulle chiavi di firma delle altre persone"
+#~ msgid ""
+#~ "For additional verification, you can <a href=\"#wot\">authenticate the "
+#~ "signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Per verifiche aggiuntive, puoi <a href=\"#wot\">autenticare la chiave di "
+#~ "firma attraverso la Web of Trust di OpenPGP</a>."
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
+#~ msgid "Verify the ISO image"
+#~ msgstr "Verificare l'immagine ISO"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], istruzioni su come gestire la fiducia nelle chiavi con "
-"Gpg4win"
+#~ msgid ""
+#~ "As explained above in step 3, this simple OpenPGP verification provides a "
+#~ "level of verification equivalent to HTTPS, like the [[Firefox extension "
+#~ "or BitTorrent|install/download]], unless you also <a href=\"#wot"
+#~ "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
+#~ msgstr ""
+#~ "Come spiegato precedentemente al passaggio 3, questa semplice verica "
+#~ "OpenPGP fornisce un livello di verifica equivalente all'HTTPS, come "
+#~ "un'[[estensione Firefox o BitTorrent|install/download]], a meno che tu "
+#~ "non <a href=\"#wot\">autentichi la chiave di firma utilizzando la Web of "
+#~ "Trust OpenPGP</a>."
+
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Altre letture su OpenPGP"
+
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], un software OpenPGP free"
+
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], un "
+#~ "tutorial sulle chiavi di firma delle altre persone"
+
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], istruzioni su come gestire la fiducia nelle chiavi "
+#~ "con Gpg4win"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/install/inc/steps/download_2.inline.pt.po b/wiki/src/install/inc/steps/download_2.inline.pt.po
index 1529992..c931695 100644
--- a/wiki/src/install/inc/steps/download_2.inline.pt.po
+++ b/wiki/src/install/inc/steps/download_2.inline.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-22 21:59+0100\n"
+"POT-Creation-Date: 2017-11-26 18:57+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"
@@ -30,93 +30,102 @@ msgstr ""
msgid "Direct download"
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>1.</span>Download Tails"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <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 indent"
-"\">Download Tails 3.1 ISO image (1.2 GB)</a>"
+"\"]]\" 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>"
msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid "<a id=\"already-downloaded\">I already downloaded Tails 3.1.</a>"
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"<a>I already downloaded Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]].</a>"
msgstr ""
#. 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>2.</span>Verify your download using your browser"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using your browser"
msgstr ""
-#. type: Content of: <div><div><div><div><p>
-msgid "<b>For your security, always verify your download!</b>"
+#. type: Content of: <div><div><div><div><p><b>
+msgid "<b>For your security,"
msgstr ""
-#. type: Content of: <div><div><div><div><div><p>
-msgid "Our browser extension makes it quick and easy."
+#. type: Content of: <div><div><div><div><p>
+msgid "always verify your download!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
-msgid "[[!toggle id=\"why-verify\" text=\"Why?\"]]"
+msgid "[[!toggle id=\"why-verify-supported\" text=\"Why?\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"[[!toggleable id=\"why-verify\" text=\"\"\" [[!toggle id=\"why-verify\" text="
-"\"X\"]]"
+"[[!toggleable id=\"why-verify-supported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-supported\" text=\"X\"]]"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><p>
+#. type: Content of: <div><div><div><div><div><p>
msgid "With an unverified download, you might:"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Lose time if your download is incomplete or broken due to an error during "
"the download. This is quite frequent."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if our download mirrors have been compromised "
"and are serving malicious downloads."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"http://blog.linuxmint.com/?p=2994\">This already happened to other "
"operating systems.</a>"
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"Get hacked while using Tails if your download is modified on the fly by an "
"attacker on the network."
msgstr ""
-#. type: Content of: <div><div><div><div><div><div><ul><li>
+#. type: Content of: <div><div><div><div><div><ul><li>
msgid ""
"<a href=\"https://en.wikipedia.org/wiki/DigiNotar\">This is possible for "
"strong adversaries.</a>"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><ol>
msgid "\"\"\"]]"
msgstr ""
+#. type: Content of: <div><div><div><div><div><p>
+msgid "Our browser extension makes it quick and easy."
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn supported-browser firefox btn btn-primary\">Install <u>Tails "
-"Verification</u> extension</a> <a class=\"install-extension-btn supported-"
-"browser chrome btn btn-primary\">Install <u>Tails Verification</u> "
-"extension</a>"
+"btn supported-browser firefox btn btn-primary inline-block\">Install "
+"<u>Tails Verification</u> extension</a> <a class=\"install-extension-btn "
+"supported-browser chrome btn btn-primary inline-block\">Install <u>Tails "
+"Verification</u> extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -137,20 +146,19 @@ msgstr ""
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
"verification/addon-tails-verification-latest.xpi\" class=\"install-extension-"
-"btn firefox btn btn-primary\">Update extension</a> <a class=\"install-"
-"extension-btn chrome btn btn-primary\">Update extension</a>"
+"btn firefox btn btn-primary inline-block\">Update extension</a> <a class="
+"\"install-extension-btn chrome btn btn-primary inline-block\">Update "
+"extension</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid "<u>Tails Verification</u> extension Installed!"
msgstr ""
-#. <a id="verify-download" class="btn btn-primary">
-#. Verify download&hellip;</a>
#. type: Content of: <div><div><div><div><div>
msgid ""
-"<label id=\"verify-download-wrapper\" class=\"btn btn-primary btn-verify\"> "
-"Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
+"<label id=\"verify-download-wrapper\" class=\"btn btn-primary inline-block"
+"\"> Verify download&hellip; <input id=\"verify-download\" type=\"file\"/> </"
"label>"
msgstr ""
@@ -167,13 +175,6 @@ msgid "<b>Verification failed!</b>"
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\">Please try to "
-"download again&hellip;</a>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><div><div><p>
msgid "[[!toggle id=\"why-failed\" text=\"Why?\"]]"
msgstr ""
@@ -201,13 +202,14 @@ msgid "Downloading again is usually enough to fix this problem."
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid "<b>Verification failed again!</b>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool\">Please try to "
+"download again&hellip;</a>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
-msgid ""
-"Please try to download again from a different place or a different "
-"computer&hellip;"
+msgid "<b>Verification failed again!</b>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
@@ -242,10 +244,19 @@ msgid ""
"these issues."
msgstr ""
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
+"Please try to download again from a different place or a different "
+"computer&hellip;"
+msgstr ""
+
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>3.</span>Continue installing"
+"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>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -259,52 +270,126 @@ msgid ""
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "[[Skip verification!|upgrade/tails]]"
+msgstr ""
+
#. type: Content of: <div><div><div><div><div>
+msgid "[["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Skip verification|debian/usb]]</span> <span class="
-"\"windows\">[[Skip verification|win/usb]]</span> <span class=\"linux"
-"\">[[Skip verification|linux/usb]]</span> <span class=\"mac-usb\">[[Skip "
-"verification|mac/usb]]</span> <span class=\"mac-dvd\">[[Skip verification|"
-"mac/dvd]]</span> <span class=\"dvd\">[[Skip verification|dvd]]</span> <span "
-"class=\"vm\">[[Skip verification|doc/advanced_topics/virtualization]]</span> "
-"<span class=\"upgrade-tails\">[[Skip verification|upgrade/tails]]</span>"
+"Next: Install <em>Tails Installer</em> (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
+msgid "|debian/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
msgid ""
-"<span class=\"debian\">[[Next: Install <em>Tails Installer</em>|debian/"
-"usb]]</span> <span class=\"windows\">[[Next: Install an intermediary Tails|"
-"win/usb]]</span> <span class=\"linux\">[[Next: Install an intermediary Tails|"
-"linux/usb]]</span> <span class=\"mac-usb\">[[Next: Install an intermediary "
-"Tails|mac/usb]]</span> <span class=\"mac-dvd\">[[Next: Burn a Tails DVD|mac/"
-"dvd]]</span> <span class=\"upgrade-tails\">[[Next: Install an intermediary "
-"Tails|upgrade/tails]]</span> (<span class=\"next-counter\"></span>)"
+"Next: Install an intermediary Tails (<span class=\"next-counter\"></span>)"
msgstr ""
#. type: Content of: <div><div><div><div><div>
-msgid ""
-"<span class=\"dvd\">[[Next: Burning Tails on a DVD|dvd]]</span> <span class="
-"\"vm\">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>"
+msgid "|win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|linux/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burn a Tails DVD (<span class=\"next-counter\"></span>)"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|mac/dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|upgrade/tails]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Burning Tails on a DVD"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|dvd]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div>
+msgid "Next: Virtualization"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+msgid "|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Windows|install/win/usb]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Windows|install/win/usb]]"
+msgid "[[Install from other Linux distributions|install/linux/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From Debian, Ubuntu, or Mint|install/debian/usb]]"
+msgid "[[Install from macOS by burning a DVD first|install/mac/dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From other Linux distributions|install/linux/usb]]"
+msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS by burning a DVD first|install/mac/dvd]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[From macOS and the command line|install/mac/usb]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -325,8 +410,8 @@ msgstr ""
#. type: Content of: <div><div><div><ul><li>
msgid ""
-"Chrome and Chromium <span id=\"min-version-chrome\">$MINVER-CHROME</span> "
-"and later (<a href=\"https://www.google.com/chrome/\">Download</a>)"
+"Chrome<span id=\"min-version-chrome\">$MINVER-CHROME</span> and later (<a "
+"href=\"https://www.google.com/chrome/\">Download</a>)"
msgstr ""
#. type: Content of: <div><div><div><ul><li>
@@ -341,21 +426,59 @@ msgid "Please update your browser to the latest version."
msgstr ""
#. type: Content of: <div><div><div><div><p>
+msgid "[[!toggle id=\"why-verify-unsupported\" text=\"Why?\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
-"Our browser extension for Firefox, Chrome, Chromium, and Tor Browser makes "
-"this quick and easy."
+"[[!toggleable id=\"why-verify-unsupported\" text=\"\"\" [[!toggle id=\"why-"
+"verify-unsupported\" text=\"X\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><p>
-msgid "<a>Why?</a>"
+msgid ""
+"Our browser extension for Firefox, Chrome, and Tor Browser makes this quick "
+"and easy."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "Copy and paste this link in Firefox, Chrome, or Tor Browser:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/debian/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/win/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/linux/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/usb-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/mac/dvd-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/upgrade/tails-download/</code>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/dvd-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Copy and paste this link in Firefox, Chrome, Chromium, or Tor Browser:"
+msgid "<code>https://tails.boum.org/install/vm-download/</code>"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "https://tails.boum.org/install/download/"
+msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
#. type: Content of: <div><div><h2>
@@ -389,23 +512,24 @@ msgstr ""
msgid "BitTorrent doesn't work over Tor or in Tails."
msgstr ""
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>1.</span>Download Tails (Torrent file)"
+"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div>
+#. type: Content of: <div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary indent"
-"\">Download Tails 3.1 Torrent file</a>"
+"\"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>"
msgstr ""
#. type: Content of: <div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
-"dvd upgrade-tails\">1.</span>2.</span>Verify your download using BitTorrent"
+"dvd upgrade-tails\">1.</span>2</span>Verify your download using BitTorrent"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -414,33 +538,21 @@ msgid ""
"complete."
msgstr ""
-#. type: Content of: <h1>
-msgid "Download and verify using OpenPGP"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"These instructions are for people who are already familiar with basic usage "
-"of OpenPGP and have <em>GPG</em> installed but might need guidance on "
-"performing the verification."
+#. type: Content of: <div><h2>
+msgid "Verify using OpenPGP (optional)"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
-"If you are not familiar with OpenPGP, download using either [[our Firefox "
-"extension or BitTorrent|install/download]] instead."
+"If you know OpenPGP, you can also verify your download using an OpenPGP "
+"signature instead, or in addition to, our browser extension or BitTorrent."
msgstr ""
-#. type: Content of: <ol><li><p>
-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>)."
+#. type: Content of: <div><ol><li><p>
+msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. 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\" "
@@ -448,107 +560,75 @@ msgid ""
"folder where you saved the ISO image."
msgstr ""
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you are doing the verification for the first time, download the [[Tails "
-"signing key|tails-signing.key]] and import it in your keyring. If you are "
-"working from Tails, the signing key is already included."
+#. type: Content of: <div><h3>
+msgid "Basic OpenPGP verification"
msgstr ""
-#. type: Content of: <ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "Note that since all Tails releases are signed with the same key, you will "
-#| "not have to verify the key every time and the trust you might "
-#| "progressively build in it will be built once and for all. Still, you will "
-#| "have to check the ISO image every time you download a new one!"
-msgid ""
-"All our ISO images are signed with the same signing key, so you only have to "
-"import it once. Still, you have to verify the ISO image every time you "
-"download a new one."
-msgstr ""
-"Note que, como todos os lançamentos do Tails são assinadas com a mesma "
-"chave, você não precisa verificar a chave toda vez. Além disso, a confiança "
-"que você pode adquirir progressivamente nesta chave em algum momento vai ser "
-"adquirida de uma vez por todas. Mesmo assim você tem que verificar a imagem "
-"ISO toda vez que baixar uma nova!"
-
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div><p>
msgid ""
-"This download of the Tails signing key is protected using HTTPS. But you "
-"could still download a malicious signing key if our website is compromised "
-"or if you are victim of a [[man-in-the-middle attack|doc/about/warning#man-"
-"in-the-middle]]."
+"Verifying using OpenPGP but without authenticating our signing key through "
+"the OpenPGP Web of Trust is equivalent in terms of security to verifying "
+"using our browser extension or BitTorrent because it relies on downloading a "
+"genuine signing key from our website."
msgstr ""
-#. type: Content of: <ol><li><div><p>
+#. type: Content of: <div>
msgid ""
-"For additional verification, you can <a href=\"#wot\">authenticate the "
-"signing key through the OpenPGP Web of Trust</a>."
+"[[!toggle id=\"basic-openpgp\" text=\"See instructions for basic OpenPGP "
+"verification.\"]] [[!toggleable id=\"basic-openpgp\" text=\"\"\" <span class="
+"\"hide\">[[!toggle id=\"basic-openpgp\" text=\"\"]]</span>"
msgstr ""
-#. type: Content of: <h2>
-msgid "Verify the ISO image"
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "This section provides simplified instructions:"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#windows\">In Windows with <span class=\"application\">Gpg4win</"
"span></a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</span></"
"a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#tails\">In Tails</a>"
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
msgid "<a href=\"#command-line\">Using the command line</a>"
msgstr ""
-#. type: Content of: <div><p>
-msgid ""
-"As explained above in step 3, this simple OpenPGP verification provides a "
-"level of verification equivalent to HTTPS, like the [[Firefox extension or "
-"BitTorrent|install/download]], unless you also <a href=\"#wot\">authenticate "
-"the signing key through the OpenPGP Web of Trust</a>."
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"windows\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Windows with <span class=\"application\">Gpg4win</span>"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid ""
"See the [[<span class=\"application\">Gpg4win</span> documentation on "
"verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24."
"html#id4]]."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"Verify the date of the signature to make sure that you downloaded the latest "
"version."
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><p>
msgid "If the following warning appears:"
msgstr ""
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
#, no-wrap
msgid ""
"Not enough information to check the signature validity.\n"
@@ -556,153 +636,170 @@ msgid ""
"The validity of the signature cannot be verified.\n"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
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>."
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"mac\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr ""
-#. type: Content of: <ol><li>
+#. 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."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
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>."
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"tails\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "In Tails"
msgstr ""
-#. type: Content of: <ol><li>
+#. 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."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Right-click on the signature and choose <span class=\"guimenuitem\">Open "
"With Verify Signature</span>."
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid "The verification of the ISO image starts automatically:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"After the verification finishes, click on the notification counter in the "
"bottom-right corner and on the notification with a transparent background on "
"the right of the notification area:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
msgstr ""
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
msgstr ""
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
msgid "Using the command line"
msgstr ""
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
msgid ""
"Open a terminal and navigate to the folder where you saved the ISO image and "
"the signature."
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "Execute:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "The output of this command should be the following:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "If the output also includes:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: WARNING: This key is not certified with a trusted signature!"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
msgid "gpg: There is no indication that the signature belongs to the owner."
msgstr ""
-#. type: Content of: <ol>
-msgid "<a id=\"wot\"></a>"
+#. type: Content of: <div><ol>
+msgid "\"\"\"]] <a id=\"wot\"></a>"
msgstr ""
-#. type: Content of: <ol><h2>
+#. type: Content of: <div><ol><h3>
msgid "Authenticate the signing key through the OpenPGP Web of Trust"
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
+msgid ""
+"Authenticating our signing key through the OpenPGP Web of Trust is the only "
+"verification technique that can protect you in case our website is "
+"compromised. It is also the most complicated technique and might not be "
+"possible for everyone to perform because it relies on trust relationships "
+"between individuals."
+msgstr ""
+
+#. type: Content of: <div><ol>
+msgid ""
+"[[!toggle id=\"web-of-trust\" text=\"Read more about authenticating the "
+"Tails signing key through the OpenPGP Web of Trust.\"]] [[!toggleable id="
+"\"web-of-trust\" text=\"\"\" <span class=\"hide\">[[!toggle id=\"web-of-trust"
+"\" text=\"\"]]</span>"
+msgstr ""
+
+#. type: Content of: <div><ol><p>
msgid ""
-"The verification techniques presented until now ([[Firefox extension, "
-"BitTorrent|install/download]], or OpenPGP verification) all rely on some "
-"information being securely downloaded using HTTPS from our website:"
+"The verification techniques presented until now (browser extension, "
+"BitTorrent, or OpenPGP verification) all rely on some information being "
+"securely downloaded using HTTPS from our website:"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>checksum</em> for the Firefox extension"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Torrent file</em> for BitTorrent"
msgstr ""
-#. type: Content of: <ol><ul><li>
+#. type: Content of: <div><ol><ul><li>
msgid "The <em>Tails signing key</em> for the OpenPGP verification"
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"But, while doing so, you could download malicious information if our website "
-"is compromised or if you are victim of a [[man-in-the-middle attack|doc/"
+"is compromised or if you are a victim of a [[man-in-the-middle attack|doc/"
"about/warning#man-in-the-middle]]."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
msgid ""
"The OpenPGP verification is the only technique that allows you to verify the "
"ISO image even better by also authenticating the Tails signing key through "
@@ -710,7 +807,7 @@ msgid ""
"way to completely protect you from malicious downloads."
msgstr ""
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are verifying an ISO image from inside Tails already, for example to "
"do a manual upgrade, then the Tails signing key is already included in "
@@ -718,7 +815,7 @@ msgid ""
"installation already because you are not downloading it."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "One of the inherent problems of standard HTTPS is that the trust we "
@@ -743,7 +840,7 @@ msgstr ""
"[[como explicado em nossa página de advertência|about/warning#man-in-the-"
"middle]]."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "We believe instead that users should be given the final say when trusting "
@@ -758,7 +855,7 @@ msgstr ""
"quanto à confiança em um sítio web, e que a indicação de confiança deve ser "
"feita com base em interação humana."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "The OpenPGP [[!wikipedia Web_of_Trust desc=\"Web of Trust\"]] is a "
@@ -772,20 +869,20 @@ msgstr ""
"A [[!wikipedia Web_of_Trust desc=\"Rede de Confiança\"]] é um modelo de "
"confiança descentralizado baseado em chaves OpenPGP. Vejamos um exemplo."
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*You're a friend of Alice and really trust her way of managing OpenPGP "
#| "keys.\n"
#| "You're trusting Alice's key.*\n"
msgid ""
-"<em>You are friend with Alice and really trust her way of managing OpenPGP "
+"<em>You are friends with Alice and really trust her way of managing OpenPGP "
"keys. So you are trusting Alice's key.</em>"
msgstr ""
"*Você é amigo de Alice e realmente confia em sua forma de gerenciar chaves "
"OpenPGP. Você está confiando na chave de Alice.*\n"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*Furthermore, Alice met Bob, a Tails developer, in a conference, and "
@@ -799,7 +896,7 @@ msgstr ""
"conferência, e assinou a chave de Bob. Alice está confiando na chave de "
"Bob*.\n"
-#. type: Content of: <ol><ol><li>
+#. type: Content of: <div><ol><ol><li>
#, fuzzy
#| msgid ""
#| "*Bob is a Tails developer who directly owns the Tails signing key. Bob "
@@ -813,7 +910,7 @@ msgstr ""
"assinatura do Tails. Bob confia completamente na chave de assinatura do "
"Tails.\n"
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "This scenario creates a trust path from you to Tails signing key that "
@@ -827,7 +924,7 @@ msgstr ""
"do Tails que pode te permitir confiar nela sem depender de autoridades "
"certificadoras."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
"If you are on Debian, Ubuntu, or Linux Mint, you can install the "
"<code>debian-keyring</code> package which contains the OpenPGP keys of all "
@@ -838,7 +935,7 @@ msgid ""
"usb]]."
msgstr ""
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "This trust model is not perfect either and requires both caution and "
@@ -855,7 +952,7 @@ msgstr ""
"criação, gerenciamento e confiança em chaves GPG estão fora do escopo deste "
"documento."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "Since the Web of Trust is actually based on human relationships and real-"
@@ -875,7 +972,7 @@ msgstr ""
"e construir relações de confiança para encontrar seu próprio caminho de "
"confiança na chave de assinatura do Tails."
-#. type: Content of: <ol><p>
+#. type: Content of: <div><ol><p>
#, fuzzy
#| msgid ""
#| "You could start by contacting a local [[!wikipedia Linux_User_Group desc="
@@ -891,52 +988,64 @@ msgstr ""
"de Usuários de Linux\" ou outros/as entusiastas do Tails próximos/as a você "
"e trocando ideia sobre suas práticas com OpenPGP."
-#. type: Content of: <ol><div><p>
+#. type: Content of: <div><ol><div><p>
msgid ""
-"After you built a trust path, you can certify the Tails signing key by "
+"After you build a trust path, you can certify the Tails signing key by "
"signing it with your own key to get rid of some warnings during the "
"verification process."
msgstr ""
-#. type: Content of: <ol><h2>
-msgid "Further reading on OpenPGP"
-msgstr "Mais leituras sobre o OpenPGP"
+#, fuzzy
+#~| msgid ""
+#~| "Note that since all Tails releases are signed with the same key, you "
+#~| "will not have to verify the key every time and the trust you might "
+#~| "progressively build in it will be built once and for all. Still, you "
+#~| "will have to check the ISO image every time you download a new one!"
+#~ msgid ""
+#~ "All our ISO images are signed with the same signing key, so you only have "
+#~ "to import it once. Still, you have to verify the ISO image every time you "
+#~ "download a new one."
+#~ msgstr ""
+#~ "Note que, como todos os lançamentos do Tails são assinadas com a mesma "
+#~ "chave, você não precisa verificar a chave toda vez. Além disso, a "
+#~ "confiança que você pode adquirir progressivamente nesta chave em algum "
+#~ "momento vai ser adquirida de uma vez por todas. Mesmo assim você tem que "
+#~ "verificar a imagem ISO toda vez que baixar uma nova!"
-#. type: Content of: <ol><ul><li>
-msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
-msgstr ""
-"[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], um software livre que "
-"implementa OpenPGP"
+#~ msgid "Further reading on OpenPGP"
+#~ msgstr "Mais leituras sobre o OpenPGP"
-#. type: Content of: <ol><ul><li>
-msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
-"[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (em inglês)"
+#~ msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
+#~ msgstr ""
+#~ "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], um software livre que "
+#~ "implementa OpenPGP"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
-"on signing keys of other people"
-msgstr ""
-"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], um tutorial "
-"sobre como assinar chaves de outras pessoas (em inglês)"
+#~ msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
+#~ msgstr ""
+#~ "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]] (em "
+#~ "inglês)"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]]"
-msgstr ""
-"[[rubin.ch: Explicação da rede de confiança do PGP|http://www.rubin.ch/pgp/"
-"weboftrust.en.html]] (em inglês)"
+#~ msgid ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a "
+#~ "tutorial on signing keys of other people"
+#~ msgstr ""
+#~ "[[Debian: Keysigning|http://www.debian.org/events/keysigning]], um "
+#~ "tutorial sobre como assinar chaves de outras pessoas (em inglês)"
-#. type: Content of: <ol><ul><li>
-msgid ""
-"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instructions to manage key trust with Gpg4win"
-msgstr ""
-"[[Gpg4win: inspeção de certificado|http://www.gpg4win.org/doc/en/gpg4win-"
-"compendium_16.html]], instruções para gerenciar confiança em chaves usando "
-"Gpg4win"
+#~ msgid ""
+#~ "[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]]"
+#~ msgstr ""
+#~ "[[rubin.ch: Explicação da rede de confiança do PGP|http://www.rubin.ch/"
+#~ "pgp/weboftrust.en.html]] (em inglês)"
+
+#~ msgid ""
+#~ "[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instructions to manage key trust with Gpg4win"
+#~ msgstr ""
+#~ "[[Gpg4win: inspeção de certificado|http://www.gpg4win.org/doc/en/gpg4win-"
+#~ "compendium_16.html]], instruções para gerenciar confiança em chaves "
+#~ "usando Gpg4win"
#~ msgid "<!-- l10n placeholder for language-specific link -->"
#~ msgstr "<!-- l10n placeholder for language-specific link -->"
diff --git a/wiki/src/install/linux/clone-overview.de.po b/wiki/src/install/linux/clone-overview.de.po
index fbf798f..f1f293c 100644
--- a/wiki/src/install/linux/clone-overview.de.po
+++ b/wiki/src/install/linux/clone-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 22:23+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -33,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,21 +44,6 @@ msgstr ""
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
"\" raw=\"yes\"]] [[<span class=\"back\">Zurück</span>|install/linux]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/clone]]"
-msgid "[[Back|install/linux]]"
-msgstr "|install/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
@@ -65,3 +51,16 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#, fuzzy
+#~| msgid "|install/clone]]"
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "|install/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/clone-overview.fa.po b/wiki/src/install/linux/clone-overview.fa.po
index 5aaf05d..85cc216 100644
--- a/wiki/src/install/linux/clone-overview.fa.po
+++ b/wiki/src/install/linux/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/linux/clone-overview.fr.po b/wiki/src/install/linux/clone-overview.fr.po
index 5df6f70..115aacd 100644
--- a/wiki/src/install/linux/clone-overview.fr.po
+++ b/wiki/src/install/linux/clone-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:08+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -16,6 +16,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -23,21 +32,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr "[[Retour|install/linux]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installer depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -46,3 +50,14 @@ msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "[[Retour|install/linux]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installer depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/clone-overview.it.po b/wiki/src/install/linux/clone-overview.it.po
index 39120d5..b9cf617 100644
--- a/wiki/src/install/linux/clone-overview.it.po
+++ b/wiki/src/install/linux/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-17 15:22+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -33,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da un altro Tails\"]] [[!meta stylesheet=\"bootstrap"
"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
@@ -43,20 +44,6 @@ msgstr ""
"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
"[[<span class=\"back\">Back</span>|install/linux]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/clone]]"
-msgid "[[Back|install/linux]]"
-msgstr "|install/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installa da <strong>un altro Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -64,3 +51,16 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#, fuzzy
+#~| msgid "|install/clone]]"
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "|install/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installa da <strong>un altro Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/clone-overview.pt.po b/wiki/src/install/linux/clone-overview.pt.po
index 5aaf05d..85cc216 100644
--- a/wiki/src/install/linux/clone-overview.pt.po
+++ b/wiki/src/install/linux/clone-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/linux/usb-overview.de.po b/wiki/src/install/linux/usb-overview.de.po
index bdc7f03..9909ca2 100644
--- a/wiki/src/install/linux/usb-overview.de.po
+++ b/wiki/src/install/linux/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 22:19+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,13 @@ msgstr ""
#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
#| "inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
+"[[!meta title=\"Install from Linux\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Andere Linux Systeme (Red Hat, Fedora, usw.)\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,29 +43,26 @@ msgstr ""
"inline pages=\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes"
"\"]] [[<span class=\"back\">Zurück</span>|install/win]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/linux/usb]]"
-msgid "[[Back|install/linux]]"
-msgstr "|install/linux/usb]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+#, fuzzy
+#| msgid "|install/linux/usb]]"
+msgid "|install/linux/usb-download]]"
msgstr "|install/linux/usb]]"
+#, fuzzy
+#~| msgid "|install/linux/usb]]"
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "|install/linux/usb]]"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+
#~ msgid ""
#~ "<strong>Install from Linux</strong> <small>(Red Hat, Fedora, etc.)</small>"
#~ msgstr ""
diff --git a/wiki/src/install/linux/usb-overview.fa.po b/wiki/src/install/linux/usb-overview.fa.po
index ea0b0fb..c1fb64a 100644
--- a/wiki/src/install/linux/usb-overview.fa.po
+++ b/wiki/src/install/linux/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Linux\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +32,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+msgid "|install/linux/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/linux/usb-overview.fr.po b/wiki/src/install/linux/usb-overview.fr.po
index 666649e..acd7ac9 100644
--- a/wiki/src/install/linux/usb-overview.fr.po
+++ b/wiki/src/install/linux/usb-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:08+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,37 +17,53 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
+#| "\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Linux : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr "[[Retour|install/linux]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr "Installer depuis <strong>Linux</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Linux\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis Linux : vue d'ensemble\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+#, fuzzy
+#| msgid "|install/linux/usb]]"
+msgid "|install/linux/usb-download]]"
msgstr "|install/linux/usb]]"
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "[[Retour|install/linux]]"
+
+#~ msgid "Install from <strong>Linux</strong>"
+#~ msgstr "Installer depuis <strong>Linux</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+
#~ msgid ""
#~ "<strong>Install from Linux</strong> <small>(Red Hat, Fedora, etc.)</small>"
#~ msgstr ""
diff --git a/wiki/src/install/linux/usb-overview.it.po b/wiki/src/install/linux/usb-overview.it.po
index 33d4b6f..33ab190 100644
--- a/wiki/src/install/linux/usb-overview.it.po
+++ b/wiki/src/install/linux/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-17 15:59+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -27,13 +27,13 @@ msgstr ""
#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
#| "\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/linux]]"
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
+"[[!meta title=\"Install from Linux\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Altre distribuzioni Linux (Red Hat, Fedora, etc.)\"]] [[!"
"meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
@@ -43,24 +43,25 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
"\"]] [[<span class=\"back\">Back</span>|install/win]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/linux/usb]]"
-msgid "[[Back|install/linux]]"
-msgstr "|install/linux/usb]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr "<strong>Installa da Linux</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+#, fuzzy
+#| msgid "|install/linux/usb]]"
+msgid "|install/linux/usb-download]]"
msgstr "|install/linux/usb]]"
+
+#, fuzzy
+#~| msgid "|install/linux/usb]]"
+#~ msgid "[[Back|install/linux]]"
+#~ msgstr "|install/linux/usb]]"
+
+#~ msgid "Install from <strong>Linux</strong>"
+#~ msgstr "<strong>Installa da Linux</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/linux/usb-overview.pt.po b/wiki/src/install/linux/usb-overview.pt.po
index ea0b0fb..c1fb64a 100644
--- a/wiki/src/install/linux/usb-overview.pt.po
+++ b/wiki/src/install/linux/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Linux: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/linux]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Linux</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Linux\"]] [[!meta stylesheet=\"bootstrap.min\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/linux\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +32,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/linux/usb]]"
+msgid "|install/linux/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/mac.de.po b/wiki/src/install/mac.de.po
index dcef2f1..2eeb76d 100644
--- a/wiki/src/install/mac.de.po
+++ b/wiki/src/install/mac.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-04-11 17:06+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -149,7 +149,9 @@ msgid "You can also:"
msgstr "Sie können auch:"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm]]"
#~ msgid "[[Back|install/os]]"
diff --git a/wiki/src/install/mac.fa.po b/wiki/src/install/mac.fa.po
index a583caa..fd2daa1 100644
--- a/wiki/src/install/mac.fa.po
+++ b/wiki/src/install/mac.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -120,5 +120,5 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
diff --git a/wiki/src/install/mac.fr.po b/wiki/src/install/mac.fr.po
index 0b6968e..a9dea61 100644
--- a/wiki/src/install/mac.fr.po
+++ b/wiki/src/install/mac.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:09+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -140,7 +140,9 @@ msgid "You can also:"
msgstr "Vous pouvez également :"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Démarrer Tails dans une machine virtuelle|vm]]"
#~ msgid "[[Back|install/os]]"
diff --git a/wiki/src/install/mac.it.po b/wiki/src/install/mac.it.po
index 76d0f05..202b9cd 100644
--- a/wiki/src/install/mac.it.po
+++ b/wiki/src/install/mac.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitalian\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 14:54+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -145,7 +145,9 @@ msgid "You can also:"
msgstr "Puoi anche:"
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Usare Tails in una macchina virtuale|vm]]"
#~ msgid "<strong>Mac</strong>"
diff --git a/wiki/src/install/mac.pt.po b/wiki/src/install/mac.pt.po
index a583caa..fd2daa1 100644
--- a/wiki/src/install/mac.pt.po
+++ b/wiki/src/install/mac.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -120,5 +120,5 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm]]"
+msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
diff --git a/wiki/src/install/mac/clone-overview.de.po b/wiki/src/install/mac/clone-overview.de.po
index 64c144d..cd12a53 100644
--- a/wiki/src/install/mac/clone-overview.de.po
+++ b/wiki/src/install/mac/clone-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-07 13:37+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -33,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installation von einem anderen Tails aus\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,21 +44,6 @@ msgstr ""
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
"\" raw=\"yes\"]] [[<span class=\"back\">Zurück</span>|install/mac]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/mac/clone]]"
-msgid "[[Back|install/mac]]"
-msgstr "|install/mac/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
@@ -65,3 +51,16 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|install/mac/clone]]"
msgstr "|install/mac/clone]]"
+
+#, fuzzy
+#~| msgid "|install/mac/clone]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/clone-overview.fa.po b/wiki/src/install/mac/clone-overview.fa.po
index 5c46cdd..14499b1 100644
--- a/wiki/src/install/mac/clone-overview.fa.po
+++ b/wiki/src/install/mac/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/mac/clone-overview.fr.po b/wiki/src/install/mac/clone-overview.fr.po
index 026f901..0559378 100644
--- a/wiki/src/install/mac/clone-overview.fr.po
+++ b/wiki/src/install/mac/clone-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:09+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,21 +33,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr "[[Retour|install/mac]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installer depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -47,3 +51,14 @@ msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
msgid "|install/mac/clone]]"
msgstr "|install/mac/clone]]"
+
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "[[Retour|install/mac]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installer depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/clone-overview.it.po b/wiki/src/install/mac/clone-overview.it.po
index ecb0ff8..9ff4769 100644
--- a/wiki/src/install/mac/clone-overview.it.po
+++ b/wiki/src/install/mac/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 14:27+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -33,7 +33,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Installa da un altro Tails\"]] [[!meta stylesheet=\"bootstrap"
"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
@@ -43,20 +44,6 @@ msgstr ""
"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
"[[<span class=\"back\">Back</span>|install/mac]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/mac/clone]]"
-msgid "[[Back|install/mac]]"
-msgstr "|install/mac/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installa da <strong>un altro Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -64,3 +51,16 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/mac/clone]]"
msgstr "|install/mac/clone]]"
+
+#, fuzzy
+#~| msgid "|install/mac/clone]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installa da <strong>un altro Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/clone-overview.pt.po b/wiki/src/install/mac/clone-overview.pt.po
index 5c46cdd..14499b1 100644
--- a/wiki/src/install/mac/clone-overview.pt.po
+++ b/wiki/src/install/mac/clone-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/mac/dvd-overview.de.po b/wiki/src/install/mac/dvd-overview.de.po
index 21d1c06..3f29b4a 100644
--- a/wiki/src/install/mac/dvd-overview.de.po
+++ b/wiki/src/install/mac/dvd-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-07 13:26+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,14 @@ msgstr ""
#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
#| "\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/mac]]"
msgid ""
-"[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac by burning a DVD first\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Mac: Eine DVD brennen und anschließend installieren\"]] [[!"
"meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
@@ -43,29 +44,26 @@ msgstr ""
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
"\" raw=\"yes\"]] [[<span class=\"back\">Zurück</span>|install/mac]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/mac/dvd]]"
-msgid "[[Back|install/mac]]"
-msgstr "|install/mac/dvd]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/dvd]]"
+#, fuzzy
+#| msgid "|install/mac/dvd]]"
+msgid "|install/mac/dvd-download]]"
msgstr "|install/mac/dvd]]"
+#, fuzzy
+#~| msgid "|install/mac/dvd]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/dvd]]"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+
#~ msgid "Mac: <strong>burn a DVD</strong> and then install"
#~ msgstr ""
#~ "Mac: <strong>Eine DVD brennen</strong> und anschließend installieren"
diff --git a/wiki/src/install/mac/dvd-overview.fa.po b/wiki/src/install/mac/dvd-overview.fa.po
index a8c9b96..820adb4 100644
--- a/wiki/src/install/mac/dvd-overview.fa.po
+++ b/wiki/src/install/mac/dvd-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac by burning a DVD first\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/dvd]]"
+msgid "|install/mac/dvd-download]]"
msgstr ""
diff --git a/wiki/src/install/mac/dvd-overview.fr.po b/wiki/src/install/mac/dvd-overview.fr.po
index bc268dd..891290d 100644
--- a/wiki/src/install/mac/dvd-overview.fr.po
+++ b/wiki/src/install/mac/dvd-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:09+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,38 +17,56 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac by burning a DVD first\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un Mac en gravant d'abord un DVD : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr "[[Retour|install/mac]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
-msgstr ""
-"Installer depuis un <strong>Mac</strong> <small>en gravant d'abord un DVD</"
-"small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un Mac en gravant d'abord un DVD : vue "
+"d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet"
+"\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel="
+"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
+"assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/dvd]]"
+#, fuzzy
+#| msgid "|install/mac/dvd]]"
+msgid "|install/mac/dvd-download]]"
msgstr "|install/mac/dvd]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "[[Retour|install/mac]]"
+
+#~ msgid ""
+#~ "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
+#~ msgstr ""
+#~ "Installer depuis un <strong>Mac</strong> <small>en gravant d'abord un "
+#~ "DVD</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+
#~ msgid "Mac: <strong>burn a DVD</strong> and then install"
#~ msgstr "Mac : <strong>graver un DVD</strong> puis installer"
diff --git a/wiki/src/install/mac/dvd-overview.it.po b/wiki/src/install/mac/dvd-overview.it.po
index a9db5fc..340721b 100644
--- a/wiki/src/install/mac/dvd-overview.it.po
+++ b/wiki/src/install/mac/dvd-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 14:35+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -27,13 +27,14 @@ msgstr ""
#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
#| "inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/mac]]"
msgid ""
-"[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac by burning a DVD first\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Mac: masterizza un DVD e poi installa\"]] [[!meta stylesheet="
"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -43,24 +44,26 @@ msgstr ""
"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
"\"]] [[<span class=\"back\">Back</span>|install/mac]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/mac/dvd]]"
-msgid "[[Back|install/mac]]"
-msgstr "|install/mac/dvd]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
-msgstr "Installa da <strong>Mac</strong> <small> creandoti un DVD</small> "
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo"
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/dvd]]"
+#, fuzzy
+#| msgid "|install/mac/dvd]]"
+msgid "|install/mac/dvd-download]]"
msgstr "|install/mac/dvd]]"
+
+#, fuzzy
+#~| msgid "|install/mac/dvd]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/dvd]]"
+
+#~ msgid ""
+#~ "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
+#~ msgstr "Installa da <strong>Mac</strong> <small> creandoti un DVD</small> "
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/dvd-overview.pt.po b/wiki/src/install/mac/dvd-overview.pt.po
index a8c9b96..820adb4 100644
--- a/wiki/src/install/mac/dvd-overview.pt.po
+++ b/wiki/src/install/mac/dvd-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Mac by burning a DVD first: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac by burning a DVD first\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-dvd\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>by burning a DVD first</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/dvd]]"
+msgid "|install/mac/dvd-download]]"
msgstr ""
diff --git a/wiki/src/install/mac/usb-overview.de.po b/wiki/src/install/mac/usb-overview.de.po
index 1e8c4b8..5e47cd6 100644
--- a/wiki/src/install/mac/usb-overview.de.po
+++ b/wiki/src/install/mac/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-07 13:30+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,14 @@ msgstr ""
#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
#| "inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/mac]]"
msgid ""
-"[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac using the command line\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installation von Mac aus unter Nutzung der Kommandozeile\"]] "
"[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
@@ -43,30 +44,31 @@ msgstr ""
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
"\" raw=\"yes\"]] [[<span class=\"back\">Zurück</span>|install/mac]]"
-#. type: Content of: <div>
+#. type: Content of: <div><div><h3>
+msgid "Let's go!"
+msgstr "Los geht's!"
+
+#. type: Content of: outside any tag (error?)
#, fuzzy
#| msgid "|install/mac/usb]]"
-msgid "[[Back|install/mac]]"
+msgid "|install/mac/usb-download]]"
msgstr "|install/mac/usb]]"
-#. type: Content of: <h1>
#, fuzzy
-#| msgid ""
-#| "Install from <strong>Mac</strong> using the <strong>command line</strong>"
-msgid "Install from <strong>Mac</strong> <small>using the command line</small>"
-msgstr ""
-"Installation von <strong>Mac</strong> aus unter Nutzung der "
-"<strong>Kommandozeile</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+#~| msgid "|install/mac/usb]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/usb]]"
-#. type: Content of: <div><div><h3>
-msgid "Let's go!"
-msgstr "Los geht's!"
+#, fuzzy
+#~| msgid ""
+#~| "Install from <strong>Mac</strong> using the <strong>command line</strong>"
+#~ msgid ""
+#~ "Install from <strong>Mac</strong> <small>using the command line</small>"
+#~ msgstr ""
+#~ "Installation von <strong>Mac</strong> aus unter Nutzung der "
+#~ "<strong>Kommandozeile</strong>"
-#. type: Content of: outside any tag (error?)
-msgid "|install/mac/usb]]"
-msgstr "|install/mac/usb]]"
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/usb-overview.fa.po b/wiki/src/install/mac/usb-overview.fa.po
index 59f2676..b2afd92 100644
--- a/wiki/src/install/mac/usb-overview.fa.po
+++ b/wiki/src/install/mac/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac using the command line\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>using the command line</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/usb]]"
+msgid "|install/mac/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/mac/usb-overview.fr.po b/wiki/src/install/mac/usb-overview.fr.po
index 2719a39..c1a20a2 100644
--- a/wiki/src/install/mac/usb-overview.fr.po
+++ b/wiki/src/install/mac/usb-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:10+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,35 +17,53 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
+#| "meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac using the command line\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un Mac en utilisant la ligne de commande : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr "[[Retour|install/mac]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>using the command line</small>"
-msgstr ""
-"Installer depuis un <strong>Mac</strong> <small>en utilisant la ligne de "
-"commande</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un Mac en utilisant la ligne de commande : "
+"vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" "
+"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/mac-usb"
+"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Allons-y !"
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/usb]]"
+#, fuzzy
+#| msgid "|install/mac/usb]]"
+msgid "|install/mac/usb-download]]"
msgstr "|install/mac/usb]]"
+
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "[[Retour|install/mac]]"
+
+#~ msgid ""
+#~ "Install from <strong>Mac</strong> <small>using the command line</small>"
+#~ msgstr ""
+#~ "Installer depuis un <strong>Mac</strong> <small>en utilisant la ligne de "
+#~ "commande</small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/usb-overview.it.po b/wiki/src/install/mac/usb-overview.it.po
index 6d210ef..85b8c47 100644
--- a/wiki/src/install/mac/usb-overview.it.po
+++ b/wiki/src/install/mac/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 14:49+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -27,13 +27,14 @@ msgstr ""
#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
#| "inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/mac]]"
msgid ""
-"[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac using the command line\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installare da Mac usando la riga di comando\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -43,25 +44,28 @@ msgstr ""
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
"\"]] [[<span class=\"back\">Back</span>|install/mac]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/mac/usb]]"
-msgid "[[Back|install/mac]]"
-msgstr "|install/mac/usb]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>using the command line</small>"
-msgstr ""
-"Installare da <strong>Mac</strong> usando la <small>riga di comando</small>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/usb]]"
+#, fuzzy
+#| msgid "|install/mac/usb]]"
+msgid "|install/mac/usb-download]]"
msgstr "|install/mac/usb]]"
+
+#, fuzzy
+#~| msgid "|install/mac/usb]]"
+#~ msgid "[[Back|install/mac]]"
+#~ msgstr "|install/mac/usb]]"
+
+#~ msgid ""
+#~ "Install from <strong>Mac</strong> <small>using the command line</small>"
+#~ msgstr ""
+#~ "Installare da <strong>Mac</strong> usando la <small>riga di comando</"
+#~ "small>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/mac/usb-overview.pt.po b/wiki/src/install/mac/usb-overview.pt.po
index 59f2676..b2afd92 100644
--- a/wiki/src/install/mac/usb-overview.pt.po
+++ b/wiki/src/install/mac/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,14 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Mac using the command line: overview\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"[[!meta title=\"Install from Mac using the command line\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/mac-usb\" rel=\"stylesheet\" title="
"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline\" "
-"raw=\"yes\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/mac]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Mac</strong> <small>using the command line</small>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"raw=\"yes\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes"
+"\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/mac/usb]]"
+msgid "|install/mac/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/win/clone-overview.de.po b/wiki/src/install/win/clone-overview.de.po
index 7a2116f..0a6a3cf 100644
--- a/wiki/src/install/win/clone-overview.de.po
+++ b/wiki/src/install/win/clone-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 21:37+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.8.7\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,28 +33,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
"[[!meta title=\"Von einem anderen Tails aus installieren\"]] [[!meta "
-"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!"
-"meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title="
-"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.de"
-"\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr "[[Zurück|install/win]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+"title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+"inline.de\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -54,3 +51,14 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "[[Zurück|install/win]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Von einem <strong>anderen Tails</strong> aus installieren"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone-overview.fa.po b/wiki/src/install/win/clone-overview.fa.po
index 8ae0d20..85cc216 100644
--- a/wiki/src/install/win/clone-overview.fa.po
+++ b/wiki/src/install/win/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/win/clone-overview.fr.po b/wiki/src/install/win/clone-overview.fr.po
index 07580ab..acd7834 100644
--- a/wiki/src/install/win/clone-overview.fr.po
+++ b/wiki/src/install/win/clone-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:12+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,21 +33,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr "[[Retour|install/win]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installer depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis un autre Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -47,3 +51,14 @@ msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "[[Retour|install/win]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installer depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone-overview.it.po b/wiki/src/install/win/clone-overview.it.po
index edc9882..6611353 100644
--- a/wiki/src/install/win/clone-overview.it.po
+++ b/wiki/src/install/win/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 15:11+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
+#| "inline\" raw=\"yes\" sort=\"age\"]]"
msgid ""
"[[!meta title=\"Install from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
@@ -24,29 +33,16 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
-"[[!meta title=\"Installa da un altro Tails\"]] [[!meta stylesheet=\"bootstrap.min"
-"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
-"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline "
-"pages=\"install/inc/tails-installation-assistant.inline.it\" raw=\"yes\" "
-"sort=\"age\"]]"
-
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/clone]]"
-msgid "[[Back|install/win]]"
-msgstr "|install/clone]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr "Installa da <strong>un altro Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installa da un altro Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
+"[[!inline pages=\"install/inc/tails-installation-assistant.inline.it\" raw="
+"\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -55,3 +51,16 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|install/clone]]"
msgstr "|install/clone]]"
+
+#, fuzzy
+#~| msgid "|install/clone]]"
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "|install/clone]]"
+
+#~ msgid "Install from <strong>another Tails</strong>"
+#~ msgstr "Installa da <strong>un altro Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/clone-overview.pt.po b/wiki/src/install/win/clone-overview.pt.po
index 8ae0d20..85cc216 100644
--- a/wiki/src/install/win/clone-overview.pt.po
+++ b/wiki/src/install/win/clone-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,19 +24,8 @@ msgid ""
"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" title=\"\"]] "
"[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes"
-"\" sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"\" sort=\"age\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort="
+"\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/install/win/usb-overview.de.po b/wiki/src/install/win/usb-overview.de.po
index 9d06812..aa375cc 100644
--- a/wiki/src/install/win/usb-overview.de.po
+++ b/wiki/src/install/win/usb-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 21:29+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -27,13 +27,13 @@ msgstr ""
#| "pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
#| "[[<span class=\"back\">Back</span>|install/win]]"
msgid ""
-"[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
+"[[!meta title=\"Install from Windows\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installation unter Windows\"]] [[!meta stylesheet=\"bootstrap"
"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
@@ -43,25 +43,25 @@ msgstr ""
"\"install/inc/tails-installation-assistant.inline.de\" raw=\"yes\"]] [[<span "
"class=\"back\">Zurück</span>|install/win]]"
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr "[[Zurück|install/win]]"
-
-#. type: Content of: <h1>
-#, fuzzy
-#| msgid "Install from <strong>windows</strong>"
-msgid "Install from <strong>Windows</strong>"
-msgstr "Installation unter <strong>Windows</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
-msgid "|install/win/usb]]"
+#, fuzzy
+#| msgid "|install/win/usb]]"
+msgid "|install/win/usb-download]]"
msgstr "|install/win/usb]]"
+
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "[[Zurück|install/win]]"
+
+#, fuzzy
+#~| msgid "Install from <strong>windows</strong>"
+#~ msgid "Install from <strong>Windows</strong>"
+#~ msgstr "Installation unter <strong>Windows</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/usb-overview.fa.po b/wiki/src/install/win/usb-overview.fa.po
index e775c87..fe4742e 100644
--- a/wiki/src/install/win/usb-overview.fa.po
+++ b/wiki/src/install/win/usb-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Windows</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Windows\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +32,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/win/usb]]"
+msgid "|install/win/usb-download]]"
msgstr ""
diff --git a/wiki/src/install/win/usb-overview.fr.po b/wiki/src/install/win/usb-overview.fr.po
index fa9d0f3..1b43488 100644
--- a/wiki/src/install/win/usb-overview.fr.po
+++ b/wiki/src/install/win/usb-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-09 21:12+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,33 +17,49 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+#| "[[!meta stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
+#| "\" raw=\"yes\" sort=\"age\"]]"
msgid ""
-"[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr "[[!meta title=\"Installer depuis Windows : vue d'ensemble\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]]"
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr "[[Retour|install/win]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Windows</strong>"
-msgstr "Installer depuis <strong>Windows</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Windows\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Installer depuis Windows : vue d'ensemble\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
+"[[!meta stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title="
+"\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr"
+"\" raw=\"yes\" sort=\"age\"]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
-msgid "|install/win/usb]]"
+#, fuzzy
+#| msgid "|install/win/usb]]"
+msgid "|install/win/usb-download]]"
msgstr "|install/win/usb]]"
+
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "[[Retour|install/win]]"
+
+#~ msgid "Install from <strong>Windows</strong>"
+#~ msgstr "Installer depuis <strong>Windows</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/usb-overview.it.po b/wiki/src/install/win/usb-overview.it.po
index b54cb29..8f7589a 100644
--- a/wiki/src/install/win/usb-overview.it.po
+++ b/wiki/src/install/win/usb-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-07-29 15:10+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -27,13 +27,13 @@ msgstr ""
#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
#| "\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
msgid ""
-"[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
+"[[!meta title=\"Install from Windows\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Installare da Windows\"]] [[!meta stylesheet=\"bootstrap\" "
"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
@@ -43,24 +43,25 @@ msgstr ""
"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] [[<span "
"class=\"back\">Back</span>|install/win]]"
-#. type: Content of: <div>
-#, fuzzy
-#| msgid "|install/win/usb]]"
-msgid "[[Back|install/win]]"
-msgstr "|install/win/usb]]"
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Windows</strong>"
-msgstr "Installare da <strong>Windows</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
-msgid "|install/win/usb]]"
+#, fuzzy
+#| msgid "|install/win/usb]]"
+msgid "|install/win/usb-download]]"
msgstr "|install/win/usb]]"
+
+#, fuzzy
+#~| msgid "|install/win/usb]]"
+#~ msgid "[[Back|install/win]]"
+#~ msgstr "|install/win/usb]]"
+
+#~ msgid "Install from <strong>Windows</strong>"
+#~ msgstr "Installare da <strong>Windows</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.it\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/install/win/usb-overview.pt.po b/wiki/src/install/win/usb-overview.pt.po
index e775c87..fe4742e 100644
--- a/wiki/src/install/win/usb-overview.pt.po
+++ b/wiki/src/install/win/usb-overview.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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,25 +18,13 @@ msgstr ""
#. type: Content of: outside any tag (error?)
msgid ""
-"[[!meta title=\"Install from Windows: overview\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
-"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
-"\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" "
-"sort=\"age\"]]"
-msgstr ""
-
-#. type: Content of: <div>
-msgid "[[Back|install/win]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Install from <strong>Windows</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Install from Windows\"]] [[!meta stylesheet=\"bootstrap.min"
+"\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/"
+"assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]] [[!inline pages="
+"\"install/inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age"
+"\"]] [[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -44,5 +32,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|install/win/usb]]"
+msgid "|install/win/usb-download]]"
msgstr ""
diff --git a/wiki/src/news/what_we_accomplished_in_2017.de.po b/wiki/src/news/what_we_accomplished_in_2017.de.po
index 6bd413f..c4e1470 100644
--- a/wiki/src/news/what_we_accomplished_in_2017.de.po
+++ b/wiki/src/news/what_we_accomplished_in_2017.de.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-11-02 14:51+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-11-12 20:32+0100\n"
+"Last-Translator: Tails translators\n"
+"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators\n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n"
"X-Poedit-Bookmarks: -1,14,-1,-1,-1,-1,-1,-1,-1,-1\n"
diff --git a/wiki/src/upgrade.de.po b/wiki/src/upgrade.de.po
index 91685bb..963a894 100644
--- a/wiki/src/upgrade.de.po
+++ b/wiki/src/upgrade.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-10 14:45+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -132,7 +132,9 @@ msgid "[[Burn a new Tails DVD|install/dvd]]"
msgstr "[[Eine neue DVD mit Tails brennen|install/dvd]]"
#. type: Content of: <div><div><small><ul><li>
-msgid "[[Upgrade your virtual machine|install/vm]]"
+#, fuzzy
+#| msgid "[[Upgrade your virtual machine|install/vm]]"
+msgid "[[Upgrade your virtual machine|install/vm-download]]"
msgstr "[[Ihre virtuelle Maschine aktualisieren|install/vm]]"
#. type: Content of: <div><div>
diff --git a/wiki/src/upgrade.fa.po b/wiki/src/upgrade.fa.po
index 8febc29..c4a4293 100644
--- a/wiki/src/upgrade.fa.po
+++ b/wiki/src/upgrade.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -106,7 +106,7 @@ msgid "[[Burn a new Tails DVD|install/dvd]]"
msgstr ""
#. type: Content of: <div><div><small><ul><li>
-msgid "[[Upgrade your virtual machine|install/vm]]"
+msgid "[[Upgrade your virtual machine|install/vm-download]]"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/upgrade.fr.po b/wiki/src/upgrade.fr.po
index 1a99f7e..f2eaeee 100644
--- a/wiki/src/upgrade.fr.po
+++ b/wiki/src/upgrade.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-10 14:45+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -124,7 +124,9 @@ msgid "[[Burn a new Tails DVD|install/dvd]]"
msgstr "[[Graver un nouveau DVD Tails|install/dvd]]"
#. type: Content of: <div><div><small><ul><li>
-msgid "[[Upgrade your virtual machine|install/vm]]"
+#, fuzzy
+#| msgid "[[Upgrade your virtual machine|install/vm]]"
+msgid "[[Upgrade your virtual machine|install/vm-download]]"
msgstr "[[Mettre à jour votre machine virtuelle|install/vm]]"
#. type: Content of: <div><div>
diff --git a/wiki/src/upgrade.it.po b/wiki/src/upgrade.it.po
index e0caf40..12a68a6 100644
--- a/wiki/src/upgrade.it.po
+++ b/wiki/src/upgrade.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-07-23 21:02+0200\n"
"Last-Translator: boyska <piuttosto@logorroici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -123,7 +123,9 @@ msgid "[[Burn a new Tails DVD|install/dvd]]"
msgstr "[[Masterizzare un nuovo DVD di Tails|install/dvd]]"
#. type: Content of: <div><div><small><ul><li>
-msgid "[[Upgrade your virtual machine|install/vm]]"
+#, fuzzy
+#| msgid "[[Upgrade your virtual machine|install/vm]]"
+msgid "[[Upgrade your virtual machine|install/vm-download]]"
msgstr "[[Aggiornare la tua macchina virtuale|install/vm]]"
#. type: Content of: <div><div>
diff --git a/wiki/src/upgrade.pt.po b/wiki/src/upgrade.pt.po
index 240d240..07f6746 100644
--- a/wiki/src/upgrade.pt.po
+++ b/wiki/src/upgrade.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-10 14:46+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -129,7 +129,9 @@ msgid "[[Burn a new Tails DVD|install/dvd]]"
msgstr "[[Gravar um novo DVD do Tails|install/dvd]]"
#. type: Content of: <div><div><small><ul><li>
-msgid "[[Upgrade your virtual machine|install/vm]]"
+#, fuzzy
+#| msgid "[[Upgrade your virtual machine|install/vm]]"
+msgid "[[Upgrade your virtual machine|install/vm-download]]"
msgstr "[[Atualizar a sua máquina virtual|install/vm]]"
#. type: Content of: <div><div>
diff --git a/wiki/src/upgrade/clone-overview.de.po b/wiki/src/upgrade/clone-overview.de.po
index 5c934d0..e589960 100644
--- a/wiki/src/upgrade/clone-overview.de.po
+++ b/wiki/src/upgrade/clone-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 19:22+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Manuell von einem anderen Tails aus aktualisieren\"]] [[!"
"meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
@@ -46,15 +46,6 @@ msgstr ""
"inc/tails-installation-assistant.inline.de\" raw=\"yes\"]] [[<span class="
"\"back\">Zurück</span>|upgrade]]"
-#. type: Content of: <h1>
-msgid "Manually upgrade from <strong>another Tails</strong>"
-msgstr "Manuell von einem <strong>anderen Tails</strong> aus aktualisieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
@@ -62,3 +53,11 @@ msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
msgid "|upgrade/clone]]"
msgstr "|upgrade/clone]]"
+
+#~ msgid "Manually upgrade from <strong>another Tails</strong>"
+#~ msgstr "Manuell von einem <strong>anderen Tails</strong> aus aktualisieren"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/clone-overview.fa.po b/wiki/src/upgrade/clone-overview.fa.po
index 2f56c92..918812c 100644
--- a/wiki/src/upgrade/clone-overview.fa.po
+++ b/wiki/src/upgrade/clone-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,16 +24,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Manually upgrade from <strong>another Tails</strong>"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
diff --git a/wiki/src/upgrade/clone-overview.fr.po b/wiki/src/upgrade/clone-overview.fr.po
index e53a73b..a20acf2 100644
--- a/wiki/src/upgrade/clone-overview.fr.po
+++ b/wiki/src/upgrade/clone-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-10 14:47+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,6 +17,16 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Manually upgrade from another Tails\"]] [[!meta "
+#| "stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+#| "stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+#| "\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/overview\" rel="
+#| "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+#| "upgrade-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/"
+#| "inc/tails-installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] "
+#| "[[<span class=\"back\">Back</span>|upgrade]]"
msgid ""
"[[!meta title=\"Manually upgrade from another Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -24,18 +34,17 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
-msgstr "[[!meta title=\"Mettre à jour manuellement depuis un autre Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Retour</span>|upgrade]]"
-
-#. type: Content of: <h1>
-msgid "Manually upgrade from <strong>another Tails</strong>"
-msgstr "Mettre à jour manuellement depuis un <strong>autre Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Mettre à jour manuellement depuis un autre Tails\"]] [[!meta "
+"stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
+"stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/overview\" rel="
+"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/"
+"upgrade-clone\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/"
+"inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]] "
+"[[<span class=\"back\">Retour</span>|upgrade]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
@@ -44,3 +53,11 @@ msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
msgid "|upgrade/clone]]"
msgstr "|upgrade/clone]]"
+
+#~ msgid "Manually upgrade from <strong>another Tails</strong>"
+#~ msgstr "Mettre à jour manuellement depuis un <strong>autre Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/clone-overview.it.po b/wiki/src/upgrade/clone-overview.it.po
index adda90b..3341e92 100644
--- a/wiki/src/upgrade/clone-overview.it.po
+++ b/wiki/src/upgrade/clone-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-08-25 18:01-0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Aggiornare manualmente da un'altra Tails\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -46,14 +46,6 @@ msgstr ""
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</"
"span>|upgrade]]"
-#. type: Content of: <h1>
-msgid "Manually upgrade from <strong>another Tails</strong>"
-msgstr "Aggiornamento manuale da <strong>un altra Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
@@ -61,3 +53,11 @@ msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
msgid "|upgrade/clone]]"
msgstr "|upgrade/clone]]"
+
+#~ msgid "Manually upgrade from <strong>another Tails</strong>"
+#~ msgstr "Aggiornamento manuale da <strong>un altra Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/clone-overview.pt.po b/wiki/src/upgrade/clone-overview.pt.po
index e5e7507..03ae3de 100644
--- a/wiki/src/upgrade/clone-overview.pt.po
+++ b/wiki/src/upgrade/clone-overview.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-03-31 03:49-0000\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-clone\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Atualizar manualmente a partir de outro Tails\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -46,14 +46,6 @@ msgstr ""
"installation-assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Voltar</"
"span>|upgrade]]"
-#. type: Content of: <h1>
-msgid "Manually upgrade from <strong>another Tails</strong>"
-msgstr "Atualizar manualmente a partir de <strong>outro Tails</strong>"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Vamos lá!"
@@ -61,3 +53,11 @@ msgstr "Vamos lá!"
#. type: Content of: outside any tag (error?)
msgid "|upgrade/clone]]"
msgstr "|upgrade/clone]]"
+
+#~ msgid "Manually upgrade from <strong>another Tails</strong>"
+#~ msgstr "Atualizar manualmente a partir de <strong>outro Tails</strong>"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/tails-overview.de.po b/wiki/src/upgrade/tails-overview.de.po
index 0874396..91b0788a 100644
--- a/wiki/src/upgrade/tails-overview.de.po
+++ b/wiki/src/upgrade/tails-overview.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-02-19 19:22+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Manuell innerhalb von Tails aktualisieren\"]] [[!meta "
"stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -46,19 +46,20 @@ msgstr ""
"installation-assistant.inline.de\" raw=\"yes\"]] [[<span class=\"back"
"\">Zurück</span>|upgrade]]"
-#. type: Content of: <h1>
-msgid "Manually upgrade <strong>inside</strong> Tails"
-msgstr "Manuell <strong>innerhalb</strong> von Tails aktualisieren"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Los geht's!"
#. type: Content of: outside any tag (error?)
-msgid "|upgrade/tails]]"
+#, fuzzy
+#| msgid "|upgrade/tails]]"
+msgid "|upgrade/tails-download]]"
msgstr "|upgrade/tails]]"
+
+#~ msgid "Manually upgrade <strong>inside</strong> Tails"
+#~ msgstr "Manuell <strong>innerhalb</strong> von Tails aktualisieren"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.de\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/tails-overview.fa.po b/wiki/src/upgrade/tails-overview.fa.po
index a5f1a05..60dba2b 100644
--- a/wiki/src/upgrade/tails-overview.fa.po
+++ b/wiki/src/upgrade/tails-overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+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"
@@ -24,16 +24,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
-msgstr ""
-
-#. type: Content of: <h1>
-msgid "Manually upgrade <strong>inside</strong> Tails"
-msgstr ""
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
#. type: Content of: <div><div><h3>
@@ -41,5 +33,5 @@ msgid "Let's go!"
msgstr ""
#. type: Content of: outside any tag (error?)
-msgid "|upgrade/tails]]"
+msgid "|upgrade/tails-download]]"
msgstr ""
diff --git a/wiki/src/upgrade/tails-overview.fr.po b/wiki/src/upgrade/tails-overview.fr.po
index ae6358c..5405aa4 100644
--- a/wiki/src/upgrade/tails-overview.fr.po
+++ b/wiki/src/upgrade/tails-overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2017-02-10 14:48+0100\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,6 +17,16 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "[[!meta title=\"Manually upgrade inside Tails\"]] [[!meta stylesheet="
+#| "\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+#| "\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+#| "meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
+#| "title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
+#| "rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+#| "installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
+#| "\"back\">Back</span>|upgrade]]"
msgid ""
"[[!meta title=\"Manually upgrade inside Tails\"]] [[!meta stylesheet="
"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
@@ -24,23 +34,32 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
-msgstr "[[!meta title=\"Mettre à jour manuellement dans Tails\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]] [[<span class=\"back\">Retour</span>|upgrade]]"
-
-#. type: Content of: <h1>
-msgid "Manually upgrade <strong>inside</strong> Tails"
-msgstr "Mettre à jour manuellement <strong>dans</strong> Tails"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
+"[[!meta title=\"Mettre à jour manuellement dans Tails\"]] [[!meta stylesheet="
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
+"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
+"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
+"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
+"installation-assistant.inline.fr\" raw=\"yes\" sort=\"age\"]] [[<span class="
+"\"back\">Retour</span>|upgrade]]"
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "C'est parti !"
#. type: Content of: outside any tag (error?)
-msgid "|upgrade/tails]]"
+#, fuzzy
+#| msgid "|upgrade/tails]]"
+msgid "|upgrade/tails-download]]"
msgstr "|upgrade/tails]]"
+
+#~ msgid "Manually upgrade <strong>inside</strong> Tails"
+#~ msgstr "Mettre à jour manuellement <strong>dans</strong> Tails"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview.fr\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/tails-overview.it.po b/wiki/src/upgrade/tails-overview.it.po
index 1885b1b..263008d 100644
--- a/wiki/src/upgrade/tails-overview.it.po
+++ b/wiki/src/upgrade/tails-overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-08-25 18:01-0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Aggiornamento manuale dentro Tails\"]] [[!meta stylesheet="
"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/"
@@ -45,20 +45,22 @@ msgstr ""
"\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-"
"assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|upgrade]]"
-#. type: Content of: <h1>
-#, fuzzy
-#| msgid "Manually upgrade <strong>inside</strong>Tails"
-msgid "Manually upgrade <strong>inside</strong> Tails"
-msgstr "Aggiornamento Manuale <strong>dentro</strong>Tails"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Iniziamo!"
#. type: Content of: outside any tag (error?)
-msgid "|upgrade/tails]]"
+#, fuzzy
+#| msgid "|upgrade/tails]]"
+msgid "|upgrade/tails-download]]"
msgstr "|upgrade/tails]]"
+
+#, fuzzy
+#~| msgid "Manually upgrade <strong>inside</strong>Tails"
+#~ msgid "Manually upgrade <strong>inside</strong> Tails"
+#~ msgstr "Aggiornamento Manuale <strong>dentro</strong>Tails"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
diff --git a/wiki/src/upgrade/tails-overview.pt.po b/wiki/src/upgrade/tails-overview.pt.po
index bc9b12f..b561847 100644
--- a/wiki/src/upgrade/tails-overview.pt.po
+++ b/wiki/src/upgrade/tails-overview.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2017-02-09 18:52+0100\n"
+"POT-Creation-Date: 2017-11-26 17:57+0000\n"
"PO-Revision-Date: 2016-03-31 03:51-0000\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -34,8 +34,8 @@ msgid ""
"meta stylesheet=\"install/inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/upgrade-tails\" "
"rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|upgrade]]"
+"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[!inline pages="
+"\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
"[[!meta title=\"Atualizar manualmente dentro do Tails\"]] [[!meta stylesheet="
"\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"install/"
@@ -46,18 +46,20 @@ msgstr ""
"assistant.inline\" raw=\"yes\"]] [[<span class=\"back\">Voltar</span>|"
"upgrade]]"
-#. type: Content of: <h1>
-msgid "Manually upgrade <strong>inside</strong> Tails"
-msgstr "Atualizar manualmente <strong>dentro</strong> do Tails"
-
-#. type: Content of: outside any tag (error?)
-msgid "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-msgstr "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
-
#. type: Content of: <div><div><h3>
msgid "Let's go!"
msgstr "Vamos lá!"
#. type: Content of: outside any tag (error?)
-msgid "|upgrade/tails]]"
+#, fuzzy
+#| msgid "|upgrade/tails]]"
+msgid "|upgrade/tails-download]]"
msgstr "|upgrade/tails]]"
+
+#~ msgid "Manually upgrade <strong>inside</strong> Tails"
+#~ msgstr "Atualizar manualmente <strong>dentro</strong> do Tails"
+
+#~ msgid ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["
+#~ msgstr ""
+#~ "[[!inline pages=\"install/inc/overview\" raw=\"yes\" sort=\"age\"]] [["