summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-09-10 15:00:03 +0000
committersajolida <sajolida@pimienta.org>2018-09-10 15:00:03 +0000
commit3e22da1e3b233860e49f42497ceff6c8658865d2 (patch)
tree79a353e57c3042397191da535d11f99d8c1ad8fd
parent03caa72056d2c07a3db5cdd59cbe6ba548d2b7ff (diff)
parentb12d1850cee8d9d17290aa4f0168882d43bc34d4 (diff)
Merge branch 'doc/15660-usb-images' into doc/15659-doc-gnome-disks-debian
-rw-r--r--wiki/src/contribute/design/installation_assistant.mdwn6
-rw-r--r--wiki/src/contribute/release_process.mdwn5
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_signature_output.html (renamed from wiki/src/inc/stable_amd64_gpg_signature_output.html)0
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_verify.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_sig_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_size.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_signature_output.html4
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_verify.html (renamed from wiki/src/inc/stable_amd64_gpg_verify.html)0
-rw-r--r--wiki/src/inc/stable_amd64_iso_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_torrent_url.html1
-rw-r--r--wiki/src/install.de.po32
-rw-r--r--wiki/src/install.es.po39
-rw-r--r--wiki/src/install.fa.po22
-rw-r--r--wiki/src/install.fr.po39
-rw-r--r--wiki/src/install.html21
-rw-r--r--wiki/src/install.it.po39
-rw-r--r--wiki/src/install.pt.po22
-rw-r--r--wiki/src/install/debian.de.po125
-rw-r--r--wiki/src/install/debian.es.po117
-rw-r--r--wiki/src/install/debian.fa.po95
-rw-r--r--wiki/src/install/debian.fr.po113
-rw-r--r--wiki/src/install/debian.html56
-rw-r--r--wiki/src/install/debian.it.po123
-rw-r--r--wiki/src/install/debian.pt.po113
-rw-r--r--wiki/src/install/download-iso.mdwn12
-rw-r--r--wiki/src/install/download.de.po12
-rw-r--r--wiki/src/install/download.es.po16
-rw-r--r--wiki/src/install/download.fa.po6
-rw-r--r--wiki/src/install/download.fr.po12
-rw-r--r--wiki/src/install/download.it.po12
-rw-r--r--wiki/src/install/download.mdwn4
-rw-r--r--wiki/src/install/download.pt.po15
-rw-r--r--wiki/src/install/expert/usb.de.po60
-rw-r--r--wiki/src/install/expert/usb.es.po70
-rw-r--r--wiki/src/install/expert/usb.fa.po24
-rw-r--r--wiki/src/install/expert/usb.fr.po60
-rw-r--r--wiki/src/install/expert/usb.it.po60
-rw-r--r--wiki/src/install/expert/usb.mdwn22
-rw-r--r--wiki/src/install/expert/usb.pt.po38
-rw-r--r--wiki/src/install/inc/icons/2-usb.pngbin1504 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/download-and-verify-in-tails.pngbin2655 -> 2779 bytes
-rw-r--r--wiki/src/install/inc/infography/install-upgrade-usb.pngbin3370 -> 3480 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-upgrade-usb.pngbin3252 -> 3366 bytes
-rw-r--r--wiki/src/install/inc/infography/upgrade-upgrade-usb.pngbin3502 -> 3596 bytes
-rw-r--r--wiki/src/install/inc/js/download.js17
-rw-r--r--wiki/src/install/inc/overview.de.po36
-rw-r--r--wiki/src/install/inc/overview.es.po2
-rw-r--r--wiki/src/install/inc/overview.fa.po2
-rw-r--r--wiki/src/install/inc/overview.fr.po2
-rw-r--r--wiki/src/install/inc/overview.html243
-rw-r--r--wiki/src/install/inc/overview.it.po2
-rw-r--r--wiki/src/install/inc/overview.pt.po2
-rw-r--r--wiki/src/install/inc/router/why_two.inline.de.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.es.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.fa.po26
-rw-r--r--wiki/src/install/inc/router/why_two.inline.fr.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.html6
-rw-r--r--wiki/src/install/inc/router/why_two.inline.it.po31
-rw-r--r--wiki/src/install/inc/router/why_two.inline.pt.po31
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin5516 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails.pngbin6339 -> 5804 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.pngbin0 -> 6678 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.pngbin0 -> 6495 bytes
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po222
-rw-r--r--wiki/src/install/inc/steps/download.inline.es.po276
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po138
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po273
-rw-r--r--wiki/src/install/inc/steps/download.inline.html83
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po216
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po138
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css10
-rw-r--r--wiki/src/install/inc/stylesheets/download-only-img.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download-only-iso.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download-only.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download.css2
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css20
-rw-r--r--wiki/src/install/linux.de.po47
-rw-r--r--wiki/src/install/linux.es.po51
-rw-r--r--wiki/src/install/linux.fa.po26
-rw-r--r--wiki/src/install/linux.fr.po45
-rw-r--r--wiki/src/install/linux.html15
-rw-r--r--wiki/src/install/linux.it.po51
-rw-r--r--wiki/src/install/linux.pt.po41
-rw-r--r--wiki/src/install/mac.de.po203
-rw-r--r--wiki/src/install/mac.es.po179
-rw-r--r--wiki/src/install/mac.fa.po93
-rw-r--r--wiki/src/install/mac.fr.po176
-rw-r--r--wiki/src/install/mac.html85
-rw-r--r--wiki/src/install/mac.it.po192
-rw-r--r--wiki/src/install/mac.pt.po93
-rw-r--r--wiki/src/install/win.de.po29
-rw-r--r--wiki/src/install/win.es.po35
-rw-r--r--wiki/src/install/win.fa.po12
-rw-r--r--wiki/src/install/win.fr.po29
-rw-r--r--wiki/src/install/win.html9
-rw-r--r--wiki/src/install/win.it.po29
-rw-r--r--wiki/src/install/win.pt.po27
99 files changed, 2427 insertions, 2348 deletions
diff --git a/wiki/src/contribute/design/installation_assistant.mdwn b/wiki/src/contribute/design/installation_assistant.mdwn
index 0a66ea8..62fb9be 100644
--- a/wiki/src/contribute/design/installation_assistant.mdwn
+++ b/wiki/src/contribute/design/installation_assistant.mdwn
@@ -30,7 +30,8 @@ The following scenarios are proposed:
- [[Install from macOS by burning a DVD first|install/mac/dvd-overview]]
- [[Install from macOS and the command line|install/mac/usb-overview]]
- [[Burn a DVD|install/dvd]]
- - [[Download without installing|install/download]]
+ - [[Download only for USB sticks|install/download]]
+ - [[Download only for DVDs and virtual machines|install/download-iso]]
The installation assistant is also adapted to cover two [[manual upgrade
scenarios|upgrade]]:
@@ -102,7 +103,8 @@ scenario and elements with the
- Classes for elements displayed only on one scenario:
- `dvd` for [[/install/dvd-download|/install/dvd-download]]
- `vm` for [[/doc/advanced_topics/virtualization|/doc/advanced_topics/virtualization]]
- - `download-only` for [[/install/download|/install/download]]
+ - `download-only-img` for [[/install/download|/install/download]]
+ - `download-only-iso` for [[/install/download|/install/download-iso]]
- `install-clone` for [[/install/clone|/install/clone]]
- `windows-usb` for [[/install/win/usb|/install/win/usb]]
- `mac-usb` for [[/install/mac/usb|/install/mac/usb]]
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 3dd6f29..e3ce66d 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -1124,6 +1124,11 @@ Rename, copy, garbage collect and update various files:
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_gpg_signature_output.html"
+ XXX: Adapt this section to also generate:
+ - inc/stable_amd64_img_size.html
+ - inc/stable_amd64_iso_gpg_signature_output.html
+ - inc/stable_amd64_img_gpg_signature_output.html
+
Ensure our [[contribute/working_together/roles/technical_writer]] has
[[written|contribute/how/documentation/release_notes]] the
announcement for the release in `wiki/src/news/version_${TAG:?}.mdwn`.
diff --git a/wiki/src/inc/stable_amd64_gpg_signature_output.html b/wiki/src/inc/stable_amd64_img_gpg_signature_output.html
index de6860e..de6860e 100644
--- a/wiki/src/inc/stable_amd64_gpg_signature_output.html
+++ b/wiki/src/inc/stable_amd64_img_gpg_signature_output.html
diff --git a/wiki/src/inc/stable_amd64_img_gpg_verify.html b/wiki/src/inc/stable_amd64_img_gpg_verify.html
new file mode 100644
index 0000000..5b00d8c
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_gpg_verify.html
@@ -0,0 +1 @@
+gpg --no-options --keyid-format 0xlong --verify tails-amd64-3.8.img.sig tails-amd64-3.8.img
diff --git a/wiki/src/inc/stable_amd64_img_sig_url.html b/wiki/src/inc/stable_amd64_img_sig_url.html
new file mode 100644
index 0000000..8b97c37
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_sig_url.html
@@ -0,0 +1 @@
+https://tails.boum.org/torrents/files/tails-amd64-3.8.img.sig
diff --git a/wiki/src/inc/stable_amd64_img_size.html b/wiki/src/inc/stable_amd64_img_size.html
new file mode 100644
index 0000000..7ad86ad
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_size.html
@@ -0,0 +1 @@
+1.2 GB
diff --git a/wiki/src/inc/stable_amd64_img_torrent_url.html b/wiki/src/inc/stable_amd64_img_torrent_url.html
new file mode 100644
index 0000000..f79555a
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_torrent_url.html
@@ -0,0 +1 @@
+https://tails.boum.org/torrents/files/tails-amd64-3.8.img.torrent
diff --git a/wiki/src/inc/stable_amd64_img_url.html b/wiki/src/inc/stable_amd64_img_url.html
new file mode 100644
index 0000000..72cb51a
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_url.html
@@ -0,0 +1 @@
+http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.8/tails-amd64-3.8.img
diff --git a/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html b/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html
new file mode 100644
index 0000000..f3ffcff
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html
@@ -0,0 +1,4 @@
+gpg:&nbsp;Signature&nbsp;made&nbsp;Mon&nbsp;25&nbsp;Jun&nbsp;2018&nbsp;11:14:47&nbsp;AM&nbsp;UTC<br/>
+gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;EDDSA&nbsp;key&nbsp;CD4D4351AFA6933F574A9AFB90B2B4BD7AED235F<br/>
+gpg:&nbsp;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
+gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;aka&nbsp;"Tails&nbsp;developers&nbsp;(offline&nbsp;long-term&nbsp;identity&nbsp;key)&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
diff --git a/wiki/src/inc/stable_amd64_gpg_verify.html b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
index 314a52a..314a52a 100644
--- a/wiki/src/inc/stable_amd64_gpg_verify.html
+++ b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
diff --git a/wiki/src/inc/stable_amd64_iso_torrent_url.html b/wiki/src/inc/stable_amd64_iso_torrent_url.html
new file mode 100644
index 0000000..51c25c8
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_iso_torrent_url.html
@@ -0,0 +1 @@
+https://tails.boum.org/torrents/files/tails-amd64-3.8.iso.torrent
diff --git a/wiki/src/inc/stable_amd64_torrent_url.html b/wiki/src/inc/stable_amd64_torrent_url.html
deleted file mode 100644
index b533d20..0000000
--- a/wiki/src/inc/stable_amd64_torrent_url.html
+++ /dev/null
@@ -1 +0,0 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.9.torrent
diff --git a/wiki/src/install.de.po b/wiki/src/install.de.po
index 8aabf80..5bfd0f6 100644
--- a/wiki/src/install.de.po
+++ b/wiki/src/install.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:00+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -83,29 +83,29 @@ msgid "|install/mac]]"
msgstr "|install/mac]]"
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr "|install/debian]]"
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
+#, fuzzy
+#| msgid "Other Linux"
+msgid "Linux"
msgstr "Anderes Linux"
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
-msgstr "<small>(Red Hat, Fedora, usw.)</small>"
-
#. type: Content of: <div><div>
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
+#~ msgid "|install/debian]]"
+#~ msgstr "|install/debian]]"
+
+#~ msgid "<small>(Red Hat, Fedora, etc.)</small>"
+#~ msgstr "<small>(Red Hat, Fedora, usw.)</small>"
+
#~ msgid "Let's start the journey!"
#~ msgstr "Lassen Sie uns die Reise beginnen!"
diff --git a/wiki/src/install.es.po b/wiki/src/install.es.po
index b2e8dfc..a9ed059 100644
--- a/wiki/src/install.es.po
+++ b/wiki/src/install.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-10 16:12+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-09 19:35+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -72,29 +72,36 @@ msgid "|install/mac]]"
msgstr "|install/mac]]"
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
-msgstr "Debian, Ubuntu, o Mint"
-
-#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr "|install/debian]]"
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
+#, fuzzy
+#| msgid "Other Linux"
+msgid "Linux"
msgstr "Otro Linux"
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
-msgstr "<small>(Red Hat, Fedora, etc.)</small>"
-
#. type: Content of: <div><div>
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Sólo descargar|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Sólo descargar|install/download]]"
+#~ msgid "Debian, Ubuntu, or Mint"
+#~ msgstr "Debian, Ubuntu, o Mint"
+
+#~ msgid "|install/debian]]"
+#~ msgstr "|install/debian]]"
+
+#~ msgid "<small>(Red Hat, Fedora, etc.)</small>"
+#~ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
+
#~ msgid "Let's start the journey!"
#~ msgstr "¡Comencemos el viaje!"
diff --git a/wiki/src/install.fa.po b/wiki/src/install.fa.po
index 68aeafa..2c94f4f 100644
--- a/wiki/src/install.fa.po
+++ b/wiki/src/install.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,25 +64,17 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
+msgid "Linux"
msgstr ""
#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
+msgid "|install/linux]]"
msgstr ""
-#. type: Content of: <div><div>
-msgid "|install/linux]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
msgstr ""
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
diff --git a/wiki/src/install.fr.po b/wiki/src/install.fr.po
index ba7c8dc..dff5386 100644
--- a/wiki/src/install.fr.po
+++ b/wiki/src/install.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-16 08:35+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -71,29 +71,36 @@ msgid "|install/mac]]"
msgstr "|install/mac]]"
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
-msgstr "Debian, Ubuntu ou Mint"
-
-#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr "|install/debian]]"
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
+#, fuzzy
+#| msgid "Other Linux"
+msgid "Linux"
msgstr "Autre Linux"
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
-msgstr "<small>(Red Hat, Fedora, etc.)</small>"
-
#. type: Content of: <div><div>
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Seulement télécharger|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Seulement télécharger|install/download]]"
+#~ msgid "Debian, Ubuntu, or Mint"
+#~ msgstr "Debian, Ubuntu ou Mint"
+
+#~ msgid "|install/debian]]"
+#~ msgstr "|install/debian]]"
+
+#~ msgid "<small>(Red Hat, Fedora, etc.)</small>"
+#~ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
+
#~ msgid "Let's start the journey!"
#~ msgstr "En route !"
diff --git a/wiki/src/install.html b/wiki/src/install.html
index 8a1055b..fbae88a 100644
--- a/wiki/src/install.html
+++ b/wiki/src/install.html
@@ -12,7 +12,7 @@
<h1>Which operating system are you installing Tails from?</h1>
<div class="row">
- <div class="col-md-6">
+ <div class="col-md-4">
[[
<div class="panel panel-primary">
<div class="panel-body">Windows</div>
@@ -20,7 +20,7 @@
|install/win]]
</div>
- <div class="col-md-6">
+ <div class="col-md-4">
[[
<div class="panel panel-primary">
<div class="panel-body">macOS</div>
@@ -28,21 +28,16 @@
|install/mac]]
</div>
- <div class="col-md-6">
+ <div class="col-md-4">
[[
<div class="panel panel-primary">
- <div class="panel-body">Debian, Ubuntu, or Mint</div>
- </div>
- |install/debian]]
- </div>
-
- <div class="col-md-6">
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines">Other Linux<br /><small>(Red Hat, Fedora, etc.)</small></div>
+ <div class="panel-body">Linux</div>
</div>
|install/linux]]
</div>
</div>
-<p>[[Download only|install/download]]</p>
+<ul>
+ <li>[[Download only for USB sticks|install/download]]</li>
+ <li>[[Download only for DVDs and virtual machines|install/download-iso]]</li>
+</ul>
diff --git a/wiki/src/install.it.po b/wiki/src/install.it.po
index 66a6c1e..bb0bd0c 100644
--- a/wiki/src/install.it.po
+++ b/wiki/src/install.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: italian\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-06-30 13:43+0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -82,29 +82,36 @@ msgid "|install/mac]]"
msgstr "|install/mac]]"
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
-msgstr "Debian, Ubuntu o Mint"
-
-#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr "|install/debian]]"
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
+#, fuzzy
+#| msgid "Other Linux"
+msgid "Linux"
msgstr "Altre versioni di Linux"
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
-msgstr "<small>(Red Hat, Fedora, etc.)</small>"
-
#. type: Content of: <div><div>
msgid "|install/linux]]"
msgstr "|install/linux]]"
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for USB sticks|install/download]]"
+msgstr "[[Scarica solamente|install/download]]"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid "[[Download only|install/download]]"
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr "[[Scarica solamente|install/download]]"
+#~ msgid "Debian, Ubuntu, or Mint"
+#~ msgstr "Debian, Ubuntu o Mint"
+
+#~ msgid "|install/debian]]"
+#~ msgstr "|install/debian]]"
+
+#~ msgid "<small>(Red Hat, Fedora, etc.)</small>"
+#~ msgstr "<small>(Red Hat, Fedora, etc.)</small>"
+
#~ msgid "Let's start the journey!"
#~ msgstr "Iniziamo!"
diff --git a/wiki/src/install.pt.po b/wiki/src/install.pt.po
index 2c3613c..24f7af5 100644
--- a/wiki/src/install.pt.po
+++ b/wiki/src/install.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,25 +65,17 @@ msgid "|install/mac]]"
msgstr ""
#. type: Content of: <div><div><div><div>
-msgid "Debian, Ubuntu, or Mint"
+msgid "Linux"
msgstr ""
#. type: Content of: <div><div>
-msgid "|install/debian]]"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "Other Linux"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "<small>(Red Hat, Fedora, etc.)</small>"
+msgid "|install/linux]]"
msgstr ""
-#. type: Content of: <div><div>
-msgid "|install/linux]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for USB sticks|install/download]]"
msgstr ""
-#. type: Content of: <p>
-msgid "[[Download only|install/download]]"
+#. type: Content of: <ul><li>
+msgid "[[Download only for DVDs and virtual machines|install/download-iso]]"
msgstr ""
diff --git a/wiki/src/install/debian.de.po b/wiki/src/install/debian.de.po
deleted file mode 100644
index a306c81..0000000
--- a/wiki/src/install/debian.de.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: 2017-02-16 18:24+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
-
-#. type: Content of: outside any tag (error?)
-#, fuzzy
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-"[[!meta title=\"Debian oder Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-"
-"debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Zurück</span>|install/os]]"
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/router/clone.de\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr "Von einem anderen Tails aus installieren"
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr "|install/debian/clone-overview]]"
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr "Herunterladen und installieren"
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr "Sie brauchen:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr "1 USB-Stick <small>(mindestens 8 GB)</small>"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-"1 Stunde zum Herunterladen von Tails (<small class=\"remove-extra-space\">[[!"
-"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
-"small>)"
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr "½ Stunde zum Installieren"
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr "[["
-
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid "Install from Debian or Ubuntu"
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr "Installation von Debian oder Ubuntu aus"
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr "|debian/usb-overview]] [["
-
-#. type: Content of: <div><div><div><div><small>
-#, fuzzy
-#| msgid "<small>Install from Debian or Ubuntu using the</small>"
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr "<small>Von Debian oder Ubuntu aus unter der Nutzung der</small>"
-
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid "command line <small> and </small> GnuPG"
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr "Kommandozeile <small> sowie </small> GnuPG"
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr "|expert/usb-overview]]"
-
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "Sie können auch:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr "[[Tails auf eine DVD brennen|dvd-download]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
-
-#~ msgid "[[Back|install/os]]"
-#~ msgstr "[[Zurück|install/os]]"
-
-#, fuzzy
-#~| msgid "<strong>Debian or Ubuntu</strong>"
-#~ msgid ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-#~ msgstr "<strong>Debian oder Ubuntu</strong>"
-
-#~ msgid "</small>"
-#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.es.po b/wiki/src/install/debian.es.po
deleted file mode 100644
index 67e0d5e..0000000
--- a/wiki/src/install/debian.es.po
+++ /dev/null
@@ -1,117 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: 2018-05-09 18:15+0000\n"
-"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
-"install-debian/es/>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-"[[!meta title=\"Debian, Ubuntu, o Mint\"]] [[!meta robots=\"noindex\"]] [["
-"!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/router/clone.es\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr "Instalar desde otro Tails"
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr "|install/debian/clone-overview]]"
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr "Descargar e instalar"
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr "Necesitas:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr "1 memoria USB <small>(de al menos 8 GB)</small>"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-"1 hora para descargar Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr "Media hora para instalar"
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr "[["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr "Instala desde Debian, Ubuntu o Mint"
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr "|debian/usb-overview]] [["
-
-#. type: Content of: <div><div><div><div><small>
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr "<small>Instala desde Debian, Ubuntu o Mint usando"
-
-#. type: Content of: <div><div><div><div>
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr "la</small> línea de comandos <small> y </small> GnuPG"
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr "|expert/usb-overview]]"
-
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "También puedes:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr "[[Grabar Tails en un DVD|dvd-download]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
-
-#~ msgid "[[Back|install/os]]"
-#~ msgstr "[[Volver|install/os]]"
-
-#~ msgid ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-#~ msgstr ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, o <strong>Mint</strong>"
-
-#~ msgid "<strong>Debian or Ubuntu</strong>"
-#~ msgstr "<strong>Debian o Ubuntu</strong>"
-
-#~ msgid "</small>"
-#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.fa.po b/wiki/src/install/debian.fa.po
deleted file mode 100644
index b82f88f..0000000
--- a/wiki/src/install/debian.fa.po
+++ /dev/null
@@ -1,95 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr ""
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr ""
-
-#. type: Content of: <div><div><div><div><small>
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr ""
diff --git a/wiki/src/install/debian.fr.po b/wiki/src/install/debian.fr.po
deleted file mode 100644
index 68a0b70..0000000
--- a/wiki/src/install/debian.fr.po
+++ /dev/null
@@ -1,113 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: 2018-05-16 09:08+0000\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#. type: Content of: outside any tag (error?)
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-"[[!meta title=\"Debian, Ubuntu ou Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/router/clone.fr\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr "Installer depuis un autre Tails"
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr "|install/debian/clone-overview]]"
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr "Téléchargement et installation"
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr "Vous avez besoin de :"
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr "1 clé USB <small>(d'au moins 8 Go)</small>"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-"1 heure pour télécharger Tails (<small class=\"remove-extra-space\">[[!"
-"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
-"small>)"
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr "½ heure pour l'installation"
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr "[["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr "Installer depuis Debian, Ubuntu ou Mint"
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr "|debian/usb-overview]] [["
-
-#. type: Content of: <div><div><div><div><small>
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr "<small>Installer depuis Debian, Ubuntu ou Mint avec"
-
-#. type: Content of: <div><div><div><div>
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr "la</small> ligne de commande <small>et</small> GnuPG"
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr "|expert/usb-overview]]"
-
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "Vous pouvez également :"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr "[[Graver Tails sur un DVD|dvd-download]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Utiliser Tails dans une machine virtuelle|vm-download]]"
-
-#~ msgid "[[Back|install/os]]"
-#~ msgstr "[[Retour|install/os]]"
-
-#~ msgid ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-#~ msgstr ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong> ou <strong>Mint</strong>"
-
-#~ msgid "</small>"
-#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.html b/wiki/src/install/debian.html
deleted file mode 100644
index c572eef..0000000
--- a/wiki/src/install/debian.html
+++ /dev/null
@@ -1,56 +0,0 @@
-[[!meta title="Debian, Ubuntu, or Mint"]]
-
-[[!meta robots="noindex"]]
-[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-
-<div id="scenarios" class="row">
- <div class="col-md-6">
-
- [[!inline pages="install/inc/router/clone" raw="yes" sort="age"]]
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body">Install from another Tails</div>
- </div>
- |install/debian/clone-overview]]
-
- </div>
- <div class="col-md-6">
-
- <h3>Download and install</h3>
-
- <h4>You need:</h4>
-
- <ul>
- <li>1 USB stick <small>(at least 8 GB)</small></li>
- <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
- <li>½ hour to install</li>
- </ul>
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body">Install from Debian, Ubuntu, or Mint</div>
- </div>
- |debian/usb-overview]]
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines"><small>Install from Debian, Ubuntu, or Mint using<br />the</small> command line <small>and</small> GnuPG</div>
- </div>
- |expert/usb-overview]]
-
- </div>
-</div>
-
-<div class="row also">
- <div class="col-sm-4 col-sm-offset-8">
-
- You can also:
- <ul>
- <li>[[Burn Tails on a DVD|dvd-download]]</li>
- <li>[[Run Tails in a virtual machine|vm-download]]</li>
- </ul>
-
- </div>
-</div>
diff --git a/wiki/src/install/debian.it.po b/wiki/src/install/debian.it.po
deleted file mode 100644
index d372554..0000000
--- a/wiki/src/install/debian.it.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: 2017-02-16 18:24+0100\n"
-"Last-Translator: transitails <transitails>\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#. type: Content of: outside any tag (error?)
-#, fuzzy
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-"[[!meta title=\"Debian o Ubuntu\"]] [[!meta stylesheet=\"bootstrap\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" "
-"rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/router-"
-"debian\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
-"installation-assistant.inline\" raw=\"yes\" sort=\"age\"]] [[<span class="
-"\"back\">Back</span>|install/os]]"
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/router/clone.it\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr "Installa da un altra Tails"
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr "|install/debian/clone-overview]]"
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr "Scaricare e installare"
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr "Ti servono:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr "1 chiavetta USB <small>(almeno 8 GB)</small>"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-"1 ora per scaricareTails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr "½ ora per installare"
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr "[["
-
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid "Install from Debian or Ubuntu"
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr "Installa da Debian o Ubuntu"
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr "|debian/usb-overview]] [["
-
-#. type: Content of: <div><div><div><div><small>
-#, fuzzy
-#| msgid "<small>Install from Debian or Ubuntu using the</small>"
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr "<small>Installa da Debian o Ubuntu usando il</small>"
-
-#. type: Content of: <div><div><div><div>
-#, fuzzy
-#| msgid "command line <small> and </small> GnuPG"
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr "terminale <small> e </small> GnuPG"
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr "|expert/usb-overview]]"
-
-#. type: Content of: <div><div>
-#, fuzzy
-#| msgid "<small> You can also:"
-msgid "You can also:"
-msgstr "<small> Puoi anche:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr "[[Masterizzare Tails su un DVD|dvd-download]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Avviare Tails in una macchina virtuale|vm-download]]"
-
-#, fuzzy
-#~| msgid "<strong>Debian or Ubuntu</strong>"
-#~ msgid ""
-#~ "<strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong>"
-#~ msgstr "<strong>Debian o Ubuntu</strong>"
-
-#~ msgid "</small>"
-#~ msgstr "</small>"
diff --git a/wiki/src/install/debian.pt.po b/wiki/src/install/debian.pt.po
deleted file mode 100644
index f2784ff..0000000
--- a/wiki/src/install/debian.pt.po
+++ /dev/null
@@ -1,113 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
-"PO-Revision-Date: 2018-04-27 10:33+0000\n"
-"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
-"install-debian/pt/>\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
-
-#. type: Content of: outside any tag (error?)
-#, fuzzy
-#| msgid ""
-#| "[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] "
-#| "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!"
-#| "meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title="
-#| "\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant.inline"
-#| "\" raw=\"yes\" sort=\"age\"]]"
-msgid ""
-"[[!meta title=\"Debian, Ubuntu, or Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]"
-msgstr ""
-"[[!meta title=\"Debian, Ubuntu, o Mint\"]] [[!meta robots=\"noindex\"]] [[!"
-"meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
-"inline pages=\"install/inc/tails-installation-assistant.inline.pt\" raw=\"yes"
-"\" sort=\"age\"]]"
-
-#. type: Content of: <div><div>
-msgid ""
-"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
-msgstr ""
-"[[!inline pages=\"install/inc/router/clone.pt\" raw=\"yes\" sort=\"age\"]] [["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from another Tails"
-msgstr "Instale a partir de outro Tails"
-
-#. type: Content of: <div><div>
-msgid "|install/debian/clone-overview]]"
-msgstr "|install/debian/clone-overview]]"
-
-#. type: Content of: <div><div><h3>
-msgid "Download and install"
-msgstr "Baixe e instale"
-
-#. type: Content of: <div><div><h4>
-msgid "You need:"
-msgstr "Você precisa de:"
-
-#. type: Content of: <div><div><ul><li>
-msgid "1 USB stick <small>(at least 8 GB)</small>"
-msgstr "1 memória USB <small>(mínimo de 8 GB)</small>"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
-"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-msgstr ""
-"1 hora para baixar o Tails (<small class=\"remove-extra-space\">[[!inline "
-"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
-
-#. type: Content of: <div><div><ul><li>
-msgid "½ hour to install"
-msgstr "½ hora pra instalar"
-
-#. type: Content of: <div><div>
-msgid "[["
-msgstr "[["
-
-#. type: Content of: <div><div><div><div>
-msgid "Install from Debian, Ubuntu, or Mint"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|debian/usb-overview]] [["
-msgstr "|debian/usb-overview]] [["
-
-#. type: Content of: <div><div><div><div><small>
-msgid "<small>Install from Debian, Ubuntu, or Mint using"
-msgstr ""
-
-#. type: Content of: <div><div><div><div>
-msgid "the</small> command line <small>and</small> GnuPG"
-msgstr ""
-
-#. type: Content of: <div><div>
-msgid "|expert/usb-overview]]"
-msgstr "|expert/usb-overview]]"
-
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Burn Tails on a DVD|dvd-download]]"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr ""
diff --git a/wiki/src/install/download-iso.mdwn b/wiki/src/install/download-iso.mdwn
new file mode 100644
index 0000000..2799f62
--- /dev/null
+++ b/wiki/src/install/download-iso.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Download and verify (for DVDs and virtual machines)"]]
+
+[[!meta robots="noindex"]]
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only-iso" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/download"]]
+[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
+
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/download.de.po b/wiki/src/install/download.de.po
index 48b7624..6c8eb12 100644
--- a/wiki/src/install/download.de.po
+++ b/wiki/src/install/download.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2016-02-14 23:40+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -17,8 +17,9 @@ msgstr ""
"X-Generator: Poedit 1.8.7\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Herunterladen und Verifizieren\"]]\n"
#. type: Plain text
@@ -49,8 +50,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.es.po b/wiki/src/install/download.es.po
index fedb487..6b537a6 100644
--- a/wiki/src/install/download.es.po
+++ b/wiki/src/install/download.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-26 06:36+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-download/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-download/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,9 @@ msgstr ""
"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Descargar y verificar\"]]\n"
#. type: Plain text
@@ -49,8 +50,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.fa.po b/wiki/src/install/download.fa.po
index f40c7b9..ee86053 100644
--- a/wiki/src/install/download.fa.po
+++ b/wiki/src/install/download.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr ""
#. type: Plain text
@@ -48,7 +48,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/download.fr.po b/wiki/src/install/download.fr.po
index c6ad55a..d349770 100644
--- a/wiki/src/install/download.fr.po
+++ b/wiki/src/install/download.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-12-03 20:04+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -17,8 +17,9 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Télécharger et vérifier\"]]\n"
#. type: Plain text
@@ -47,8 +48,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.it.po b/wiki/src/install/download.it.po
index a38f8ea..1a395d6 100644
--- a/wiki/src/install/download.it.po
+++ b/wiki/src/install/download.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-06-03 18:04+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -18,8 +18,9 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr "[[!meta title=\"Scarica e verifica\"]]\n"
#. type: Plain text
@@ -50,8 +51,9 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
diff --git a/wiki/src/install/download.mdwn b/wiki/src/install/download.mdwn
index 1acb68d..4c8541d 100644
--- a/wiki/src/install/download.mdwn
+++ b/wiki/src/install/download.mdwn
@@ -1,11 +1,11 @@
-[[!meta title="Download and verify"]]
+[[!meta title="Download and verify (for USB sticks)"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only-img" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/download"]]
[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
diff --git a/wiki/src/install/download.pt.po b/wiki/src/install/download.pt.po
index 099b658..e28869f 100644
--- a/wiki/src/install/download.pt.po
+++ b/wiki/src/install/download.pt.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:41+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails"
-"/install-download/pt/>\n"
+"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
+"install-download/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Download and verify\"]]\n"
+msgid "[[!meta title=\"Download and verify (for USB sticks)\"]]\n"
msgstr ""
#. type: Plain text
@@ -50,9 +50,10 @@ msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" t
msgstr "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
+msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only-img\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!meta stylesheet=\"install/inc/stylesheets/download\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index df670cf..11a8528 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:21+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -64,10 +64,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Wenn Sie den Signaturschlüssel von Tails schon mit Ihrem eigenen Schlüssel zertifiziert haben,\n"
@@ -80,9 +84,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"In diesem Schritt werden Sie den *Signaturschlüssel von Tails*, welcher der "
"OpenPGP-Schlüssel ist, der für die kryptografische Signierung des ISO-Images "
@@ -295,45 +304,59 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Laden Sie das ISO-Image herunter und verifizieren Sie es</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"In diesem Schritt werden Sie das aktuellste ISO-Image von Tails "
"herunterladen und es mithilfe des Signaturschlüssels von Tails verifizieren."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Laden Sie das ISO-Image herunter:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Laden Sie die Signatur des ISO-Images herunter:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verifizieren Sie, dass das ISO-Image mit dem Signaturschlüssel von Tails "
"signiert wurde:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -342,8 +365,9 @@ msgid " The output of this command should be the following:\n"
msgstr " Die Ausgabe des Befehls sollte folgendermaßen sein:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.es.po b/wiki/src/install/expert/usb.es.po
index 5110bff..032b16d 100644
--- a/wiki/src/install/expert/usb.es.po
+++ b/wiki/src/install/expert/usb.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-expert-usb/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-expert-usb/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,10 +63,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Si ya certificaste la llave de firmado de Tails con tu propia llave, puedes\n"
@@ -79,9 +83,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"En este paso, vas a descargar y verificar la *llave de firmado de Tails** "
"que es la llave OpenPGP que es usada para firmar la imagen ISO de Tails "
@@ -291,44 +300,58 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Descargar y verificar la imagen ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"En este paso, descargarás la última imagen ISO de Tails y la verificarás "
"usando la llave de firmado de Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Descargar la imagen ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Descargar la firma de la imagen ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verificar que la imagen ISO esté firmada por la llave de firmado de Tails:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -337,8 +360,9 @@ msgid " The output of this command should be the following:\n"
msgstr " La salida de este comando debería ser la siguiente:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -389,10 +413,8 @@ msgid ""
" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports main'\n"
" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-backports.list && echo \"OK\"\n"
msgstr ""
-" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports "
-"main'\n"
-" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-"
-"backports.list && echo \"OK\"\n"
+" BACKPORTS='deb http://http.debian.net/debian/ stretch-backports main'\n"
+" echo $BACKPORTS | sudo tee /etc/apt/sources.list.d/stretch-backports.list && echo \"OK\"\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index eb38948..b0262d1 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
@@ -75,7 +75,7 @@ msgstr ""
#. type: Plain text
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
#. type: Plain text
@@ -240,40 +240,40 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr ""
#. type: Plain text
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
@@ -283,7 +283,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index c76eb08..50edc07 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-20 11:21+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -61,10 +61,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Si vous avez déjà certifié la clé de signature Tails avec votre propre clé, vous\n"
@@ -77,9 +81,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"À cette étape, vous allez télécharger et vérifier la *clé de signature de "
"Tails* qui est la clé OpenPGP utilisée pour signer cryptographiquement les "
@@ -286,43 +295,57 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Télécharger et vérifier l'image ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"À cette étape, vous allez télécharger la dernière image ISO de Tails et la "
"vérifier avec la clé de signature de Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Télécharger l'image ISO :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Télécharger la signature de l'image ISO :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr "Vérifier que l'image ISO est signée par la clé de signature de Tails :"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -331,8 +354,9 @@ msgid " The output of this command should be the following:\n"
msgstr " La sortie de cette commande devrait être la suivante :\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index 3b865f6..d8bb911 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2017-02-09 19:22+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -61,10 +61,14 @@ msgid "<div class=\"tip\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>If you already certified the Tails signing key with your own key, you\n"
+#| "can skip this step and start [[downloading and verifying the ISO\n"
+#| "image|usb#download]].</p>\n"
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
"<p>Se hai già certificato la chiave di firma di Tails con la tua chiave, puoi\n"
@@ -77,9 +81,14 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download and verify the *Tails signing key* which "
+#| "is the OpenPGP key that is used to cryptographically sign the Tails ISO "
+#| "image."
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
"In questo passaggio scaricherai e verificherai la *chiave di firma di "
"Tails*, che è la chiave OpenPGP usata per firmare l'immagine ISO di Tails "
@@ -285,44 +294,58 @@ msgid "<a id=\"download\"></a>\n"
msgstr "<a id=\"download\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+#, fuzzy, no-wrap
+#| msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr "<h1 id=\"download-verify\">Scarica e verifica l'immagine ISO</h1>\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "In this step, you will download the latest Tails ISO image and verify it "
+#| "using the Tails signing key."
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
"In questo passaggio, scaricherai l'ultima immagine ISO di Tails e la "
"verificherai usando la chiave di firma di Tails."
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+#, fuzzy
+#| msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr "Scarica l'immagine ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+#, fuzzy
+#| msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr "Scarica la firma dell'immagine ISO:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+#, fuzzy
+#| msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
"Verifica che l'immagine ISO sia firmata con la chiave di firma di Tails:"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
@@ -331,8 +354,9 @@ msgid " The output of this command should be the following:\n"
msgstr " L'output di questo comanda dovrebbe essere il seguente:\n"
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+#, fuzzy, no-wrap
+#| msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index 95aae41..26e5934 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -14,14 +14,14 @@ Start in Debian, Ubuntu, or Linux Mint.
<div class="tip">
<p>If you already certified the Tails signing key with your own key, you
-can skip this step and start [[downloading and verifying the ISO
+can skip this step and start [[downloading and verifying the USB
image|usb#download]].</p>
</div>
In this step, you will download and verify the *Tails signing
key* which is the OpenPGP key that is used to cryptographically sign
-the Tails ISO image.
+the Tails USB image.
<div class="note">
@@ -100,26 +100,26 @@ Trust|install/download#openpgp]].
<a id="download"></a>
-<h1 id="download-verify">Download and verify the ISO image</h1>
+<h1 id="download-verify">Download and verify the USB image</h1>
-In this step, you will download the latest Tails ISO image and verify it
+In this step, you will download the latest Tails USB image and verify it
using the Tails signing key.
-1. Download the ISO image:
+1. Download the USB image:
- <p class="pre">wget --continue [[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]</p>
+ <p class="pre">wget --continue [[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]</p>
-1. Download the signature of the ISO image:
+1. Download the signature of the USB image:
- <p class="pre">wget [[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]</p>
+ <p class="pre">wget [[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]</p>
-1. Verify that the ISO image is signed by the Tails signing key:
+1. Verify that the USB image is signed by the Tails signing key:
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
The output of this command should be the following:
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
Verify in this output that:
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index 819a0f2..6cfacde 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-04-27 10:45+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails"
-"/install-expert-usb/pt/>\n"
+"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
+"install-expert-usb/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr "<div class=\"tip\">\n"
#, no-wrap
msgid ""
"<p>If you already certified the Tails signing key with your own key, you\n"
-"can skip this step and start [[downloading and verifying the ISO\n"
+"can skip this step and start [[downloading and verifying the USB\n"
"image|usb#download]].</p>\n"
msgstr ""
@@ -79,7 +79,7 @@ msgstr "</div>\n"
#. type: Plain text
msgid ""
"In this step, you will download and verify the *Tails signing key* which is "
-"the OpenPGP key that is used to cryptographically sign the Tails ISO image."
+"the OpenPGP key that is used to cryptographically sign the Tails USB image."
msgstr ""
#. type: Plain text
@@ -244,41 +244,43 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h1 id=\"download-verify\">Download and verify the ISO image</h1>\n"
+msgid "<h1 id=\"download-verify\">Download and verify the USB image</h1>\n"
msgstr ""
#. type: Plain text
msgid ""
-"In this step, you will download the latest Tails ISO image and verify it "
+"In this step, you will download the latest Tails USB image and verify it "
"using the Tails signing key."
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the ISO image:"
+msgid "Download the USB image:"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Download the signature of the ISO image:"
+msgid "Download the signature of the USB image:"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Bullet: '1. '
-msgid "Verify that the ISO image is signed by the Tails signing key:"
+msgid "Verify that the USB image is signed by the Tails signing key:"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -287,7 +289,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
+msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" sort=\"age\"]]</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/inc/icons/2-usb.png b/wiki/src/install/inc/icons/2-usb.png
deleted file mode 100644
index b87d384..0000000
--- a/wiki/src/install/inc/icons/2-usb.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/infography/download-and-verify-in-tails.png b/wiki/src/install/inc/infography/download-and-verify-in-tails.png
index 616b21e..b51b1e7 100644
--- a/wiki/src/install/inc/infography/download-and-verify-in-tails.png
+++ b/wiki/src/install/inc/infography/download-and-verify-in-tails.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/install-upgrade-usb.png b/wiki/src/install/inc/infography/install-upgrade-usb.png
index ed02a74..6b16a9c 100644
--- a/wiki/src/install/inc/infography/install-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/install-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/plug-upgrade-usb.png b/wiki/src/install/inc/infography/plug-upgrade-usb.png
index 4d0d753..db71e62 100644
--- a/wiki/src/install/inc/infography/plug-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/plug-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/upgrade-upgrade-usb.png b/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
index f5912b0..a8c4039 100644
--- a/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/js/download.js b/wiki/src/install/inc/js/download.js
index 772b645..0bee729 100644
--- a/wiki/src/install/inc/js/download.js
+++ b/wiki/src/install/inc/js/download.js
@@ -257,8 +257,11 @@ document.addEventListener("DOMContentLoaded", function() {
opaque(document.getElementById("continue-link-direct"));
opaque(document.getElementById("continue-link-bittorrent"));
- // Display "Verify with your browser" when ISO image is clicked
- document.getElementById("download-iso").onclick = function() {
+ // Display "Verify with your browser" when image is clicked
+ document.getElementById("download-img").onclick = function() { displayVerificationExtension(); }
+ document.getElementById("download-iso").onclick = function() { displayVerificationExtension(); }
+
+ function displayVerificationExtension() {
toggleDirectBitTorrent("direct");
resetVerificationResult();
}
@@ -270,13 +273,19 @@ document.addEventListener("DOMContentLoaded", function() {
}
// Reset verification when downloading again after failure
- document.getElementById("download-iso-again").onclick = function() {
+ document.getElementById("download-img-again").onclick = function() { resetVerification(); }
+ document.getElementById("download-iso-again").onclick = function() { resetVerification(); }
+
+ function resetVerification() {
toggleDirectBitTorrent("direct");
resetVerificationResult();
}
// Display "Verify with BitTorrent" when Torrent file is clicked
- document.getElementById("download-torrent").onclick = function() {
+ document.getElementById("download-img-torrent").onclick = function() { displayBitTorrentVerification(); }
+ document.getElementById("download-iso-torrent").onclick = function() { displayBitTorrentVerification(); }
+
+ function displayBitTorrentVerification() {
toggleDirectBitTorrent("bittorrent");
}
diff --git a/wiki/src/install/inc/overview.de.po b/wiki/src/install/inc/overview.de.po
index c10bece..310acc5 100644
--- a/wiki/src/install/inc/overview.de.po
+++ b/wiki/src/install/inc/overview.de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-09-04 12:52+0200\n"
-"PO-Revision-Date: 2018-08-25 12:19+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
+"PO-Revision-Date: 2018-04-04 20:23+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"Language: de\n"
@@ -326,6 +326,38 @@ msgstr "Konfigurieren"
#~ "Stunde zum Aktualisieren</small></span>"
#, fuzzy
+#~| msgid ""
+#~| "<span class=\"windows linux mac-usb mac-dvd\">2 hours</span> <span class="
+#~| "\"debian expert\">1½ hour</span> <span class=\"install-clone\">½ hour</"
+#~| "span> <span class=\"upgrade-clone\">¼ hour</span>"
+#~ msgid ""
+#~ "<span class=\"windows linux mac-usb mac-dvd upgrade-tails\">2 hours in "
+#~ "total</span> <span class=\"debian expert\">1½ hour in total</span> <span "
+#~ "class=\"install-clone\">½ hour</span> <span class=\"upgrade-clone\">¼ "
+#~ "hour</span>"
+#~ msgstr ""
+#~ "<span class=\"windows linux mac-usb mac-dvd\">2 Stunden</span> <span "
+#~ "class=\"debian expert\">1½ Stunden</span> <span class=\"install-clone"
+#~ "\">½ Stunde</span> <span class=\"upgrade-clone\">¼ Stunde</span>"
+
+#, fuzzy
+#~| msgid ""
+#~| "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+#~| "install</small></span> <span class=\"debian expert\"><small>½ hour to "
+#~| "install</small></span> <span class=\"upgrade-tails\"><small>½ hour to "
+#~| "upgrade</small></span>"
+#~ msgid ""
+#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 hour to "
+#~ "install</small></span> <span class=\"debian expert\"><small>½ hour to "
+#~ "install</small></span> <span class=\"upgrade-tails\"><small>¼ hour to "
+#~ "upgrade</small></span>"
+#~ msgstr ""
+#~ "</span> <span class=\"windows linux mac-usb mac-dvd\"><small>1 Stunde zum "
+#~ "Installieren</small></span> <span class=\"debian expert\"><small>½ Stunde "
+#~ "zum Installieren</small></span> <span class=\"upgrade-tails\"><small>½ "
+#~ "Stunde zum Aktualisieren</small></span>"
+
+#, fuzzy
#~| msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
#~ msgid ""
#~ "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\" alt="
diff --git a/wiki/src/install/inc/overview.es.po b/wiki/src/install/inc/overview.es.po
index 95f2718..4951f79 100644
--- a/wiki/src/install/inc/overview.es.po
+++ b/wiki/src/install/inc/overview.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-20 15:50+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-09 18:18+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
diff --git a/wiki/src/install/inc/overview.fa.po b/wiki/src/install/inc/overview.fa.po
index a5a518b..e21b2da 100644
--- a/wiki/src/install/inc/overview.fa.po
+++ b/wiki/src/install/inc/overview.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 15:50+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+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"
diff --git a/wiki/src/install/inc/overview.fr.po b/wiki/src/install/inc/overview.fr.po
index 6785afd..6b8df66 100644
--- a/wiki/src/install/inc/overview.fr.po
+++ b/wiki/src/install/inc/overview.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-08-20 15:50+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-03-26 12:52+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
diff --git a/wiki/src/install/inc/overview.html b/wiki/src/install/inc/overview.html
index 5bed45c..5f1e86c 100644
--- a/wiki/src/install/inc/overview.html
+++ b/wiki/src/install/inc/overview.html
@@ -2,14 +2,13 @@
<div id="needs">
<h3>You need</h3>
<div class="row">
- <div class="col-xs-12 col-sm-3">
+ <div class="col-xs-12 col-sm-2">
<div class="thumbnail">
[[!img install/inc/icons/clock.png link="no" alt=""]]
<div class="caption">
<h4>
- <span class="windows linux mac-usb mac-dvd">2 hours in total</span>
- <span class="debian expert upgrade-tails">1½ hour in total</span>
+ <span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">1½ hours in total</span>
<span class="install-clone">½ hour</span>
<span class="upgrade-clone">¼ hour</span>
<br />
@@ -18,14 +17,13 @@
<small>[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]] to download</small><br />
</span>
- <span class="windows linux mac-usb mac-dvd"><small>1 hour to install</small></span>
- <span class="debian expert"><small>½ hour to install</small></span>
+ <span class="windows linux mac-usb mac-dvd debian expert"><small>½ hour to install</small></span>
<span class="upgrade-tails"><small>½ hour to upgrade</small></span>
</h4>
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 upgrade-clone upgrade-tails">
+ <div class="col-xs-12 col-sm-2 upgrade-clone upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -33,7 +31,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 install-clone upgrade-clone">
+ <div class="col-xs-12 col-sm-2 install-clone upgrade-clone">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no"]]
<div class="caption">
@@ -43,25 +41,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb">
- <div class="thumbnail">
- [[!img install/inc/icons/2-usb.png link="no" alt=""]]
- <div class="caption">
- <h4>2 USB sticks<br />
- <small>8 GB minimum</small><br />
- <small>All data will be lost!<br />
-
- [[!toggle id="why_two" text="Why 2?"]]</small>
- </h4>
-
- [[!toggleable id="why_two" text="""
- [[!toggle id="why_two" text="X"]]
- [[!inline pages="install/inc/router/why_two.inline" raw="yes" sort="age"]]
- """]]
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 debian expert install-clone mac-dvd">
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb debian expert install-clone mac-dvd">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -72,7 +52,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 upgrade-tails">
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -91,7 +71,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
+ <div class="col-xs-12 col-sm-2 mac-dvd">
<div class="thumbnail">
[[!img install/inc/icons/1-dvd.png link="no" alt=""]]
<div class="caption">
@@ -101,7 +81,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3">
+ <div class="col-xs-12 col-sm-2">
<div class="thumbnail">
[[!img install/inc/icons/screens.png link="no" alt=""]]
<div class="caption">
@@ -120,130 +100,87 @@
<div id="steps">
<h3>Your steps</h3>
- <ol>
- <li>
- <h4>
- First you will
- <span class="windows linux mac-usb">install an intermediary Tails on the first USB stick.</span>
- <span class="mac-dvd">burn an intermediary Tails on a DVD.</span>
- <span class="debian expert">install a Tails on your USB stick.</span>
- <span class="install-clone upgrade-clone">restart on the other Tails.</span>
- <span class="upgrade-tails">install an intermediary Tails.</span>
- </h4>
- <span class="windows linux mac-usb mac-dvd upgrade-tails"><small>[[!toggle id="why_two" text="Why an intermediary Tails?"]]</small></span>
- <div class="row">
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd debian expert upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]]
- <div class="caption">
- <h5>Download</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 install-clone upgrade-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/restart-on-intermediary-tails.png link="no" alt="Computer restarted on USB stick on the left"]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/install-intermediary-tails.png link="no" alt="ISO image installed on USB stick on the left"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/install-upgrade-usb.png link="no" alt="ISO image installed on USB stick on the left"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
- <div class="thumbnail">
- [[!img install/inc/infography/insert-dvd.png link="no" alt="DVD inserted"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
+ <div class="row">
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]]
+ <p>Download</p>
</div>
- </li>
- <li>
- <h4>
- Then you will
- <span class="windows linux mac-usb">install the final Tails on the second USB stick.</span>
- <span class="mac-dvd">install the final Tails on your USB stick.</span>
- <span class="install-clone">install Tails on your USB stick.</span>
- <span class="debian expert">configure it.</span>
- <span class="upgrade-clone upgrade-tails">upgrade your Tails.</span>
- </h4>
- <div class="row">
- <div class="col-xs-12 col-sm-3 upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb upgrade-tails upgrade-clone install-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/clone-intermediary-tails.png link="no" alt="Tails installed on USB stick on the right"]]
- <div class="caption">
- <h5>
- <span class="install-clone windows linux mac-usb">Install</span>
- <span class="upgrade">Upgrade</span>
- </h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
- <div class="thumbnail">
- [[!img install/inc/infography/clone-dvd.png link="no" alt="Tails installed on USB stick on the right"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd install-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd install-clone debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]]
- <div class="caption">
- <h5>Configure</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/download-and-verify-in-tails.png link="no" alt="ISO image downloaded and verified"]]
+ <p>Download</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 install-clone upgrade-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart-on-intermediary-tails.png link="no" alt="Computer restarted on USB stick on the left"]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/install-tails.png link="no" alt="ISO image installed on USB stick on the right"]]
+ <p>Install</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/install-upgrade-usb.png link="no" alt="ISO image installed on USB stick on the left"]]
+ <p>Install intermediary</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd">
+ <div class="thumbnail">
+ [[!img install/inc/infography/insert-dvd.png link="no" alt="DVD inserted"]]
+ <p>Install</p>
</div>
- </li>
- </ol>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails upgrade-clone install-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/clone-intermediary-tails.png link="no" alt="Tails installed on USB stick on the right"]]
+ <p>
+ <span class="install-clone">Install</span>
+ <span class="upgrade">Upgrade</span>
+ </p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd">
+ <div class="thumbnail">
+ [[!img install/inc/infography/clone-dvd.png link="no" alt="Tails installed on USB stick on the right"]]
+ <p>Install</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd install-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd install-clone debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]]
+ <p>Configure</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ </div>
</div>
diff --git a/wiki/src/install/inc/overview.it.po b/wiki/src/install/inc/overview.it.po
index 87a3ac9..66a3542 100644
--- a/wiki/src/install/inc/overview.it.po
+++ b/wiki/src/install/inc/overview.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-20 15:50+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2016-09-02 14:00+0200\n"
"Last-Translator: ita team\n"
"Language-Team: ita <transitails@inventati.org>\n"
diff --git a/wiki/src/install/inc/overview.pt.po b/wiki/src/install/inc/overview.pt.po
index aa44db2..aff140a 100644
--- a/wiki/src/install/inc/overview.pt.po
+++ b/wiki/src/install/inc/overview.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-08-20 15:50+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2017-02-09 19:26+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wiki/src/install/inc/router/why_two.inline.de.po b/wiki/src/install/inc/router/why_two.inline.de.po
deleted file mode 100644
index 8a36f06..0000000
--- a/wiki/src/install/inc/router/why_two.inline.de.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-02-07 11:31+0100\n"
-"PO-Revision-Date: 2016-02-07 09:17+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">macOS,</span> this scenario requires creating an intermediary "
-"Tails on a second USB stick. This intermediary Tails lacks important "
-"security and usability features."
-msgstr ""
-"Da es derzeit nicht möglich ist, Tails direkt von <span class=\"windows"
-"\">Windows,</span> <span class=\"linux\">Linux</span> <span class=\"mac"
-"\">macOS,</span> aus zu installieren, benötigt diese Vorgehensweise ein "
-"zwischenzeitliches Tails auf einem zweiten USB-Stick. Diesem "
-"zwischenzeitlichen Tails fehlen wichtige Sicherheits- und "
-"Bedienungsfunktionen."
diff --git a/wiki/src/install/inc/router/why_two.inline.es.po b/wiki/src/install/inc/router/why_two.inline.es.po
deleted file mode 100644
index dcc37a7..0000000
--- a/wiki/src/install/inc/router/why_two.inline.es.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-30 12:41+0000\n"
-"PO-Revision-Date: 2018-01-30 14:37+0000\n"
-"Last-Translator: Weblate Admin <admin@example.com>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/why_twoinline/es/>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">macOS,</span> this scenario requires creating an intermediary Tails "
-"on a second USB stick. This intermediary Tails lacks important security and "
-"usability features."
-msgstr ""
-"Ya que instalar Tails directamente desde <span class=\"windows\""
-">Windows,</span> <span class=\"linux\">Linux,</span> o <span class=\"mac\""
-">macOS,</span>, este escenario requiere instalar primero un Tails intermedio "
-"en una segunda memoria USB. Este Tails intermedio carece de importantes "
-"funcionalidades de seguridad y usabilidad."
diff --git a/wiki/src/install/inc/router/why_two.inline.fa.po b/wiki/src/install/inc/router/why_two.inline.fa.po
deleted file mode 100644
index 759323e..0000000
--- a/wiki/src/install/inc/router/why_two.inline.fa.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span "
-"class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span "
-"class=\"mac\">macOS,</span> this scenario requires creating an "
-"intermediary Tails on a second USB stick. This intermediary Tails lacks "
-"important security and usability features."
-msgstr ""
diff --git a/wiki/src/install/inc/router/why_two.inline.fr.po b/wiki/src/install/inc/router/why_two.inline.fr.po
deleted file mode 100644
index b2d58a4..0000000
--- a/wiki/src/install/inc/router/why_two.inline.fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
-"PO-Revision-Date: 2016-02-22 17:16+0100\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">macOS,</span> this scenario requires creating an intermediary "
-"Tails on a second USB stick. This intermediary Tails lacks important "
-"security and usability features."
-msgstr ""
-"Étant donné qu'il est actuellement impossible d'installer Tails directement "
-"depuis <span class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</"
-"span> <span class=\"mac\">macOS,</span> ce scénario requiert la création "
-"d'un Tails intermédiaire sur une seconde clé USB. Ce Tails intermédiaire ne "
-"bénéficiera pas de fonctionnalités importantes et des protections de "
-"sécurité de Tails."
diff --git a/wiki/src/install/inc/router/why_two.inline.html b/wiki/src/install/inc/router/why_two.inline.html
deleted file mode 100644
index bdb959c..0000000
--- a/wiki/src/install/inc/router/why_two.inline.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>As it is currently impossible to install Tails directly from
-<span class="windows">Windows,</span>
-<span class="linux">Linux,</span>
-<span class="mac">macOS,</span>
-this scenario requires creating an intermediary Tails on a second USB stick.
-This intermediary Tails lacks important security and usability features.</p>
diff --git a/wiki/src/install/inc/router/why_two.inline.it.po b/wiki/src/install/inc/router/why_two.inline.it.po
deleted file mode 100644
index bfbeb7a..0000000
--- a/wiki/src/install/inc/router/why_two.inline.it.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2016-01-03 23:50+0100\n"
-"PO-Revision-Date: 2016-09-02 14:02+0200\n"
-"Last-Translator: anoni\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">macOS,</span> this scenario requires creating an intermediary "
-"Tails on a second USB stick. This intermediary Tails lacks important "
-"security and usability features."
-msgstr ""
-"Al momento non è possibile installare una Tails direttamente da <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> o <span "
-"class=\"mac\">macOS,</span>: questa situazione richiede una Tails, su una "
-"seconda chiavetta USB o DVD, che faccia da intermediaria. Questa Tails di "
-"intermediazione manca di importanti caratteristiche di sicurezza e usabilità."
diff --git a/wiki/src/install/inc/router/why_two.inline.pt.po b/wiki/src/install/inc/router/why_two.inline.pt.po
deleted file mode 100644
index 376a2b9..0000000
--- a/wiki/src/install/inc/router/why_two.inline.pt.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
-"PO-Revision-Date: 2016-04-04 20:29-0000\n"
-"Last-Translator: Tails translators <taisl@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Content of: <p>
-msgid ""
-"As it is currently impossible to install Tails directly from <span class="
-"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">macOS,</span> this scenario requires creating an intermediary "
-"Tails on a second USB stick. This intermediary Tails lacks important "
-"security and usability features."
-msgstr ""
-"Como é atualmente impossível instalar o Tails diretamente a partir do <span "
-"class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span "
-"class=\"mac\">macOS,</span> este cenário requer criar um Tails "
-"intermediário em uma segunda unidade USB. Este Tails intermediário carece "
-"de recursos de segurança e usabilidade importantes."
diff --git a/wiki/src/install/inc/screenshots/notification_in_tails.png b/wiki/src/install/inc/screenshots/notification_in_tails.png
deleted file mode 100644
index 5c0b291..0000000
--- a/wiki/src/install/inc/screenshots/notification_in_tails.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/verifying_in_tails.png b/wiki/src/install/inc/screenshots/verifying_in_tails.png
index 8840dd6..5ec133c 100644
--- a/wiki/src/install/inc/screenshots/verifying_in_tails.png
+++ b/wiki/src/install/inc/screenshots/verifying_in_tails.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png b/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png
new file mode 100644
index 0000000..7d608f6
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png b/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png
new file mode 100644
index 0000000..0a79fc9
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/download.inline.de.po b/wiki/src/install/inc/steps/download.inline.de.po
index efd8795..f467db9 100644
--- a/wiki/src/install/inc/steps/download.inline.de.po
+++ b/wiki/src/install/inc/steps/download.inline.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,34 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"Laden Sie das <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] ISO-Image herunter</a> (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -253,6 +280,24 @@ msgstr ""
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -305,13 +350,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -436,15 +481,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -536,6 +581,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -573,7 +622,7 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -581,10 +630,29 @@ msgstr ""
#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] OpenPGP-Signatur</a> des aktuellsten ISO-Images von Tails "
+"herunter und speichern Sie sie in dem gleichen Ordner, in dem Sie das ISO-"
+"Image gespeichert haben."
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -604,11 +672,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -626,11 +705,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr ""
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Laden Sie die <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -722,8 +811,13 @@ msgstr ""
"Die Gültigkeit der Signatur kann nicht überprüft werden.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -741,16 +835,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Öffnen Sie den <span class=\"application\">Finder</span> und navigieren Sie "
"zu dem Ordner, in dem Sie das ISO-Image und die Signatur gespeichert haben."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -767,9 +870,13 @@ msgid "In Tails"
msgstr "In Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Öffnen Sie den Dateibrowser und navigieren Sie zu dem Ordner, in dem Sie das "
"ISO-Image und die Signatur gespeichert haben."
@@ -783,7 +890,9 @@ msgstr ""
"\">Mit Signatur-Datei überprüfen öffnen</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "Die Verifizierung des ISO-Image startet automatisch:"
#. type: Content of: <div><ol><li><p>
@@ -797,7 +906,19 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -809,9 +930,13 @@ msgid "Using the command line"
msgstr "Mithilfe der Kommandozeile"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Öffnen Sie ein Terminal und navigieren Sie zu dem Ordner, in dem Sie das ISO-"
"Image und die Signatur gespeichert haben."
@@ -821,8 +946,22 @@ msgid "Execute:"
msgstr "Führen Sie aus:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -831,9 +970,25 @@ msgid "The output of this command should be the following:"
msgstr "Die Ausgabe des Befehls sollte folgende sein:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -940,10 +1095,10 @@ msgstr ""
#| "Tails. You can trust this signing key as much as you are trusting your "
#| "Tails installation already because you are not downloading it."
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Wenn Sie das ISO-Image bereits von einem Tails aus verifizieren, zum "
"Beispiel wenn Sie eine manuelle Aktualisierung durchführen, ist der "
@@ -1135,6 +1290,11 @@ msgstr ""
"einige der Warnungen während des Verifizierungsprozesses loszuwerden."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Verify the date of the signature to make sure that you downloaded the "
#~ "latest version."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.es.po b/wiki/src/install/inc/steps/download.inline.es.po
index 72c48b8..8625d10 100644
--- a/wiki/src/install/inc/steps/download.inline.es.po
+++ b/wiki/src/install/inc/steps/download.inline.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-05-09 18:54+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -42,7 +42,47 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Descarga Tails"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary "
+#| "inline-block indent\">Download Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
+#| "\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+#| "\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+#| "stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+#| "class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+#| "\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!inline "
+#| "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Descarga la imagen ISO [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] de Tails (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+"stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+"class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+"\">Descarga la imagen ISO [[!inline pages=\"inc/stable_amd64_version\" raw="
+"\"yes\" sort=\"age\"]] de Tails (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a>"
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -284,6 +324,21 @@ msgstr ""
"Descargar otra vez usualmente es suficiente para arreglar este problema."
#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry"
+#| "\">Please try to download again&hellip;</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Por "
+"favor, intenta la descarga nuevamente&hellip;</a>"
+
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
@@ -341,13 +396,20 @@ msgstr ""
"Por favor intenta descargarla de nuevo de un lugar diferente o desde un "
"ordenador diferente&hellip;"
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"debian windows "
@@ -488,6 +550,10 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr "[[Instalar desde macOS con la línea de comandos|install/mac/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgstr "[[Actualizar dentro de Tails|upgrade/tails]]"
+
+#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Burn on a DVD|dvd]]"
msgstr "Grabar un DVD"
@@ -495,10 +561,6 @@ msgstr "Grabar un DVD"
msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr "[[Ejecutar en una máquina virtual|doc/advanced_topics/virtualization]]"
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
-msgstr "[[Actualizar dentro de Tails|upgrade/tails]]"
-
#. type: Content of: <div><div><div><p>
msgid ""
"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
@@ -601,6 +663,12 @@ msgstr "<code>https://tails.boum.org/install/vm-download/</code>"
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr "<code>https://tails.boum.org/install/download/</code>"
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<code>https://tails.boum.org/install/download/</code>"
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr "<code>https://tails.boum.org/install/download/</code>"
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr "Descarga con BitTorrent"
@@ -647,12 +715,36 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Descarga Tails (archivo Torrent)"
-#. type: Content of: <div><div><div>
-msgid ""
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"indent\">Descargar el archivo torrent de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a>"
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
@@ -675,11 +767,39 @@ msgstr ""
"Tu cliente BitTorrent verificará automáticamente la descarga cuando haya "
"terminado."
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continúa <span class=\"debian windows "
+"linux mac-usb mac-dvd\">instalando</span> <span class=\"upgrade-tails"
+"\">actualizando</span> <span class=\"download-only\">instalando o "
+"actualizando</span>"
+
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Open and download the Torrent file with your BitTorrent client. It "
+#| "contains the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image that you will use in the next step."
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
"Abre y descarga el archivo torrent con tu cliente de torrents favorito (ej. "
"BitTorrent). Contiene la imagen ISO de Tails [[!inline pages=\"inc/"
@@ -704,11 +824,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr "Descarga la [[llave de firma de Tails|tails-signing.key]]."
#. type: Content of: <div><ol><li><p>
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Descarga la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'> [[!inline pages=\"inc/stable_amd64_version\" raw="
@@ -800,8 +930,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -818,16 +953,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "En macOS usando <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Abre <span class=\"application\">Finder</span> y navega a la carpeta donde "
"guardaste la imagen ISO y la firma."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -844,9 +988,13 @@ msgid "In Tails"
msgstr "En Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Abre el explorador de archivos y navega a la carpeta donde guardaste la "
"imagen ISO y la firma."
@@ -860,7 +1008,9 @@ msgstr ""
"\">Abrir con Verificar la Firma</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La verificación de la imagen ISO comienza automáticamente:"
#. type: Content of: <div><ol><li><p>
@@ -876,8 +1026,20 @@ msgstr ""
"es buena:"
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
-msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
msgid "<a id=\"command-line\"></a>"
@@ -888,9 +1050,13 @@ msgid "Using the command line"
msgstr "Usando la linea de comandos"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Abre una terminal y navega hacia la carpeta donde guardaste la imagen ISO y "
"la firma."
@@ -900,8 +1066,22 @@ msgid "Execute:"
msgstr "Ejecuta:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -910,9 +1090,25 @@ msgid "The output of this command should be the following:"
msgstr "El output de este comando debería ser el siguiente:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -1010,11 +1206,18 @@ msgstr ""
"Confianza OpenPGP."
#. type: Content of: <div><div><p>
-msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+#, fuzzy
+#| msgid ""
+#| "If you are verifying an ISO image from inside Tails, for example, to do a "
+#| "manual upgrade, then you already have the Tails signing key. You can "
+#| "trust this signing key as much as you already trust your Tails "
+#| "installation since this signing key is included in your Tails "
+#| "installation."
+msgid ""
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Si estás verificando una imagen ISO desde dentro de Tails, por ejemplo para "
"hacer una actualización manual, entonces ya tienes la clave de firma de "
@@ -1115,6 +1318,11 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.fa.po b/wiki/src/install/inc/steps/download.inline.fa.po
index 661e856..189d5a8 100644
--- a/wiki/src/install/inc/steps/download.inline.fa.po
+++ b/wiki/src/install/inc/steps/download.inline.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,22 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -222,6 +237,13 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -269,13 +291,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -400,15 +422,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -500,6 +522,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -537,12 +563,20 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
#. type: Content of: <div><div><div><h3>
@@ -557,11 +591,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -580,10 +625,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
#. type: Content of: <div><h3>
@@ -657,7 +706,7 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -673,12 +722,12 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -693,8 +742,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
@@ -704,7 +753,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -718,7 +767,15 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr ""
#. type: Content of: <div>
@@ -731,8 +788,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -741,7 +798,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -750,8 +814,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
-"\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -826,10 +896,10 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
#. type: Content of: <div><p>
diff --git a/wiki/src/install/inc/steps/download.inline.fr.po b/wiki/src/install/inc/steps/download.inline.fr.po
index 2f4991b..b180e96 100644
--- a/wiki/src/install/inc/steps/download.inline.fr.po
+++ b/wiki/src/install/inc/steps/download.inline.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-03-29 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -40,7 +40,46 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails"
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary "
+#| "inline-block indent\">Download Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
+#| "\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
+#| "\"yes\" sort=\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/"
+#| "stable_amd64_iso_url\" raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" "
+#| "class=\"use-mirror-pool-on-retry btn btn-primary inline-block indent"
+#| "\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!inline "
+#| "pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Télécharger l'image ISO de Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] (<span class=\"remove-"
+"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+"\"age\"]]</span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" "
+"raw=\"yes\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-"
+"retry btn btn-primary inline-block indent\">Télécharger l'image ISO de Tails "
+"[[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] "
+"(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+"stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)</a>"
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -284,6 +323,21 @@ msgstr ""
"Télécharger à nouveau est généralement suffisant pour corriger ce problème."
#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
+#| "\"age\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry"
+#| "\">Please try to download again&hellip;</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Merci "
+"d'essayer à nouveau de télécharger&hellip;</a>"
+
+#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
@@ -341,13 +395,20 @@ msgstr ""
"Merci d'essayer de télécharger à nouveau depuis un autre endroit ou un autre "
"ordinateur&hellip;"
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
@@ -490,6 +551,10 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr "[[Installer depuis macOS et la ligne de commande|install/mac/usb]]"
#. type: Content of: <div><div><div><div><ul><li>
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgstr "[[Mettre à jour depuis Tails|upgrade/tails]]"
+
+#. type: Content of: <div><div><div><div><ul><li>
msgid "[[Burn on a DVD|dvd]]"
msgstr "[[Graver sur un DVD|dvd]]"
@@ -498,10 +563,6 @@ msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
"[[Exécuter dans une machine virtuelle|doc/advanced_topics/virtualization]]"
-#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
-msgstr "[[Mettre à jour depuis Tails|upgrade/tails]]"
-
#. type: Content of: <div><div><div><p>
msgid ""
"You are using <u><b><span id=\"detected-browser\">$DETECTED-BROWSER</span></"
@@ -610,6 +671,12 @@ msgstr "<code>https://tails.boum.org/install/vm-download/index.fr.html</code>"
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr "<code>https://tails.boum.org/install/download/index.fr.html</code>"
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<code>https://tails.boum.org/install/download/</code>"
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr "<code>https://tails.boum.org/install/download/index.fr.html</code>"
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr "Téléchargement BitTorrent"
@@ -657,12 +724,36 @@ msgstr ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>1</span>Télécharger Tails (fichier Torrent)"
-#. type: Content of: <div><div><div>
-msgid ""
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"indent\">Télécharger le fichier Torrent Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]]</a>"
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" "
+#| "sort=\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-"
+#| "block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version"
+#| "\" raw=\"yes\" sort=\"age\"]] Torrent file</a>"
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
@@ -686,11 +777,39 @@ msgstr ""
"Votre client BitTorrent va automatiquement vérifier votre téléchargement "
"lorsqu'il est terminé."
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid ""
+#| "<span class=\"step-number\"><span class=\"debian windows linux mac-usb "
+#| "mac-dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+#| "windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-"
+#| "tails\">upgrading</span> <span class=\"download-only\">installing or "
+#| "upgrading</span>"
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd upgrade-tails\">1.</span>3</span>Continuer <span class=\"debian windows "
+"linux mac-usb mac-dvd\">l'installation</span> <span class=\"upgrade-tails"
+"\">la mise à jour</span> <span class=\"download-only\">l'installation ou la "
+"mise à jour</span>"
+
#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Open and download the Torrent file with your BitTorrent client. It "
+#| "contains the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes"
+#| "\" sort=\"age\"]] ISO image that you will use in the next step."
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
"Ouvrez et télécharger le fichier Torrent avec votre client BitTorrent. Il "
"contient l'image ISO de Tails [[!inline pages=\"inc/stable_amd64_version\" "
@@ -714,11 +833,21 @@ msgid "Download the [[Tails signing key|tails-signing.key]]."
msgstr "Téléchargement de la [[clé de signature Tails|tails-signing.key]]."
#. type: Content of: <div><ol><li><p>
-msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "and save it to the same folder where you saved the ISO image."
+msgid ""
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Téléchargez la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\" sort=\"age\"]]'>signature OpenPGP de Tails [[!inline pages=\"inc/"
@@ -811,8 +940,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -829,16 +963,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Ouvrez <span class=\"application\">Finder</span> et naviguez jusqu'au "
"dossier où vous avez enregistré l'image ISO et la signature."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -855,9 +998,13 @@ msgid "In Tails"
msgstr "Pour Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Ouvrez le navigateur de fichier et naviguez jusqu'au dossier où vous avez "
"enregistré l'image ISO et la signature."
@@ -871,7 +1018,9 @@ msgstr ""
"\">Ouvrir avec Vérifier la signature</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La vérification de l'image ISO démarre automatiquement :"
#. type: Content of: <div><ol><li><p>
@@ -887,7 +1036,19 @@ msgstr ""
"informant que la signature est bonne :"
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -899,9 +1060,13 @@ msgid "Using the command line"
msgstr "En ligne de commande"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Ouvrez un terminal et naviguez jusqu'au dossier où vous avez enregistré "
"l'image ISO et la signature."
@@ -911,8 +1076,22 @@ msgid "Execute:"
msgstr "Exécutez la commande :"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -921,9 +1100,25 @@ msgid "The output of this command should be the following:"
msgstr "La sortie de cette commande devrait être :"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -1021,11 +1216,18 @@ msgstr ""
"signature de Tails avec la toile de confiance OpenPGP."
#. type: Content of: <div><div><p>
-msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+#, fuzzy
+#| msgid ""
+#| "If you are verifying an ISO image from inside Tails, for example, to do a "
+#| "manual upgrade, then you already have the Tails signing key. You can "
+#| "trust this signing key as much as you already trust your Tails "
+#| "installation since this signing key is included in your Tails "
+#| "installation."
+msgid ""
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Si vous vérifiez une image ISO depuis Tails, par exemple pour faire une mise "
"à jour manuelle, vous avez déjà la clé de signature de Tails. Vous pouvez "
@@ -1169,6 +1371,11 @@ msgstr ""
"des avertissements durant le processus de vérification."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index 72195b9..1c366ee 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -9,10 +9,16 @@
<h2>Direct download</h2>
<div class="supported-browser no-js">
- <div id="step-download-iso">
+ <div id="step-download-direct">
<h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
- <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
- <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
+ <div class="debian windows linux mac-usb upgrade-tails download-only-img">
+ <a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
+ <a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
+ </div>
+ <div class="mac-dvd dvd vm download-only-iso">
+ <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
+ <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
+ </div>
<p id="already-downloaded" class="indent"><a>I already downloaded Tails <span class="remove-extra-space">&nbsp;[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</span>.</a></p>
</div>
@@ -87,7 +93,8 @@
<p>[[How does the extension work?|contribute/design/verification_extension]]</p>
"""]]
</div>
- <p><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
+ <p class="debian windows linux mac-usb upgrade-tails download-only-img"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
+ <p class="mac-dvd dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
</div>
<div id="verification-failed-again" class="block">
<p><b>Verification failed again!</b></p>
@@ -113,7 +120,7 @@
<h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
<span class="debian windows linux mac-usb mac-dvd">installing</span>
<span class="upgrade-tails">upgrading</span>
- <span class="download-only">installing or upgrading</span></h3>
+ <span class="download-only-img download-only-iso">installing or upgrading</span></h3>
</div>
<div id="continue-link-direct" class="indent">
<div id="skip-download-direct">
@@ -145,15 +152,17 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
- <ul class="download-only">
+ <ul class="download-only-img">
<li>[[Install from Windows|install/win/usb]]</li>
<li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
<li>[[Install from other Linux distributions|install/linux/usb]]</li>
<li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
<li>[[Install from macOS and the command line|install/mac/usb]]</li>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+ </ul>
+ <ul class="download-only-iso">
<li>[[Burn on a DVD|dvd]]</li>
<li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
- <li>[[Upgrade inside Tails|upgrade/tails]]</li>
</ul>
</div>
</div>
@@ -201,7 +210,8 @@
<p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
<p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
<p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
- <p class="download-only"><code>https://tails.boum.org/install/download/</code></p>
+ <p class="download-only-img"><code>https://tails.boum.org/install/download/</code></p>
+ <p class="download-only-iso"><code>https://tails.boum.org/install/download-iso/</code></p>
</div> <!-- Outdated browser -->
</div> <!-- Direct download -->
@@ -224,7 +234,12 @@
<div id="step-download-torrent">
<h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
- <a href="[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]" id="download-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file</a>
+ <div class="debian windows linux mac-usb upgrade-tails download-only-img">
+ <a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" id="download-img-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for USB image</a>
+ </div>
+ <div class="mac-dvd dvd vm download-only-iso">
+ <a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" id="download-iso-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for ISO image</a>
+ </div>
</div>
<div id="step-verify-bittorrent">
@@ -233,14 +248,16 @@
</div>
<div id="step-continue-bittorrent">
- <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
+ <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails">1.</span>3</span>Continue
<span class="debian windows linux mac-usb mac-dvd">installing</span>
<span class="upgrade-tails">upgrading</span>
- <span class="download-only">installing or upgrading</span></h3>
- <p class="debian windows linux mac-usb mac-dvd upgrade-tails indent">Open and download
+ <span class="download-only-img download-only-iso">installing or upgrading</span></h3>
+ <p class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails indent">Open and download
the Torrent file with your BitTorrent client. It contains the
- Tails [[!inline pages="inc/stable_amd64_version" raw="yes"
- sort="age"]] ISO image that you will use in the next step.</p>
+ Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]
+ <span class="debian windows linux mac-usb upgrade-tails">USB</span>
+ <span class="mac-dvd dvd vm">ISO</span>
+ image that you will use in the next step.</p>
</div>
<div id="continue-link-bittorrent" class="indent">
<div id="skip-download-bittorrent">
@@ -262,15 +279,17 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
- <ul class="download-only">
+ <ul class="download-only-img">
<li>[[Install from Windows|install/win/usb]]</li>
<li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
<li>[[Install from other Linux distributions|install/linux/usb]]</li>
<li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
<li>[[Install from macOS and the command line|install/mac/usb]]</li>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+ </ul>
+ <ul class="download-only-iso">
<li>[[Burn on a DVD|dvd]]</li>
<li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
- <li>[[Upgrade inside Tails|upgrade/tails]]</li>
</ul>
</div>
</div>
@@ -292,10 +311,11 @@ BitTorrent.</p>
</li>
<li>
- <p>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>
+ <p>Download the
+ <a class="debian windows linux mac-usb upgrade-tails" href='[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
+ <a class="mac-dvd dvd vm" href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
- you saved the ISO image.</p>
+ you saved the image.</p>
</li>
</ol>
@@ -333,7 +353,7 @@ Signed on ... by tails@boum.org (Key ID: 0x58ACD84F
The validity of the signature cannot be verified.
</pre>
-<p>Then the ISO image is still correct according to the signing key that you
+<p>Then the image is still correct according to the signing key that you
downloaded. To remove this warning you need to <a href="#wot">authenticate the
signing key through the OpenPGP Web of Trust</a>.</p>
@@ -344,11 +364,11 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
Open <span class="application">Finder</span> and navigate to the
- folder where you saved the ISO image and the signature.
+ folder where you saved the image and the signature.
</li>
<li>
- Right-click on the ISO image and choose
+ Right-click on the image and choose
<span class="guimenuchoice">
<span class="guisubmenu">Services</span> ▸
<span class="guimenuitem">OpenPGP: Verify Signature of File</span></span>.
@@ -362,7 +382,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
Open the file browser and navigate to the folder where you saved the
- ISO image and the signature.
+ image and the signature.
</li>
<li>
@@ -371,7 +391,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
</li>
<li>
- The verification of the ISO image starts automatically:
+ The verification of the image starts automatically:
<p>[[!img install/inc/screenshots/verifying_in_tails.png link="no"]]</p>
</li>
@@ -380,7 +400,8 @@ signing key through the OpenPGP Web of Trust</a>.</p>
After the verification finishes, you should see a notification that the
signature is good:
- <p>[[!img install/inc/screenshots/notification_in_tails.png link="no"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails">[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="no"]]</p>
+ <p class="mac-dvd dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -394,18 +415,20 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
- Open a terminal and navigate to the folder where you saved the ISO
+ Open a terminal and navigate to the folder where you saved the
image and the signature.
</li>
<li>
<p>Execute:</p>
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
earlier than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -417,7 +440,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
gpg: There is no indication that the signature belongs to the owner.<br/>
</p>
- <p>Then the ISO image is still correct according to the signing key that you
+ <p>Then the image is still correct according to the signing key that you
downloaded. To remove this warning you need to <a href="#wot">authenticate
the signing key through the OpenPGP Web of Trust</a>.</p>
</li>
@@ -463,7 +486,7 @@ through the OpenPGP Web of Trust.</p>
<div class="note">
-<p>If you are verifying an ISO image from inside Tails, for
+<p>If you are verifying an image from inside Tails, for
example, to do a manual upgrade, then you already have the Tails signing key.
You can trust this signing key as much as you already trust your
Tails installation since this signing key is included in your Tails
diff --git a/wiki/src/install/inc/steps/download.inline.it.po b/wiki/src/install/inc/steps/download.inline.it.po
index a3f8d9b..6c842f6 100644
--- a/wiki/src/install/inc/steps/download.inline.it.po
+++ b/wiki/src/install/inc/steps/download.inline.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,34 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
+#| "\"yes\" sort=\"age\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages="
+#| "\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> "
+#| "(<span class=\"remove-extra-space\">[[!inline pages=\"inc/"
+#| "stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
+"\"]]' class=\"use-mirror-pool\"> Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\"]] immagine ISO </a> (<span class=\"remove-"
+"extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort="
+"\"age\"]]</span>)."
+
+#. type: Content of: <div><div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_url\" raw="
@@ -253,6 +280,24 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
+
+#. type: Content of: <div><div><div><div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -304,13 +349,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -435,15 +480,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -535,6 +580,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -572,7 +621,7 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
#, fuzzy
#| msgid ""
#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
@@ -581,10 +630,29 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
+"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
+"sort=\"age\"]] firma OpenPGP</a> dell'ultima immagine ISO Tails e salvala "
+"nella stessa cartella in cui hai savato l'immagine ISO."
+
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid ""
+#| "Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+#| "raw=\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/"
+#| "stable_amd64_version\" raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> "
+#| "of the latest Tails ISO image and save it to the same folder where you "
+#| "saved the ISO image."
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -603,11 +671,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -633,10 +712,14 @@ msgstr ""
#| "of the latest Tails ISO image and save it to the same folder where you "
#| "saved the ISO image."
msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
"Scarica la <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
"\"yes\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" "
@@ -726,8 +809,13 @@ msgstr ""
"The validity of the signature cannot be verified.\n"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "Then the ISO image is still correct according to the signing key that you "
+#| "downloaded. To remove this warning you need to <a href=\"#wot"
+#| "\">authenticate the signing key through the OpenPGP Web of Trust</a>."
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -744,16 +832,25 @@ msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open <span class=\"application\">Finder</span> and navigate to the folder "
+#| "where you saved the ISO image and the signature."
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
"Apri il <span class=\"application\">Finder</span> e naviga nella cartella "
"dove hai salvato l'immagine ISO e la firma."
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Right-click on the ISO image and choose <span class=\"guimenuchoice\"> "
+#| "<span class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem"
+#| "\">OpenPGP: Verify Signature of File</span></span>."
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -770,9 +867,13 @@ msgid "In Tails"
msgstr "Su Tails"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open the file browser and navigate to the folder where you saved the ISO "
+#| "image and the signature."
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
"Apri il navigatore di file e arriva nella cartella dove hai salvato "
"l'immagine ISO e la firma."
@@ -786,7 +887,9 @@ msgstr ""
"\">Open With Verify Signature</span>."
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+#, fuzzy
+#| msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr "La verifica dell'immagine ISO inizierà automaticamente:"
#. type: Content of: <div><ol><li><p>
@@ -800,7 +903,19 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid "[[!img install/inc/screenshots/verifying_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
#. type: Content of: <div>
@@ -812,9 +927,13 @@ msgid "Using the command line"
msgstr "Usare la riga di comando"
#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Open a terminal and navigate to the folder where you saved the ISO image "
+#| "and the signature."
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
"Apri un terminale e naviga nella cartella dove hai salvato l'immagine ISO e "
"la firma."
@@ -824,8 +943,22 @@ msgid "Execute:"
msgstr "Esegui:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
@@ -834,9 +967,25 @@ msgid "The output of this command should be the following:"
msgstr "L'output di questo comando dovrebbe essere il seguente:"
#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
msgid ""
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
+
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" "
+#| "sort=\"age\"]]"
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
"\"age\"]]"
@@ -941,10 +1090,10 @@ msgstr ""
#| "Tails. You can trust this signing key as much as you are trusting your "
#| "Tails installation already because you are not downloading it."
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
"Se stai verificando un'immagine ISO essendo già in Tails, per esempio per "
"fare un aggiornamento manuale, allora la chiave di firma Tails è già inclusa "
@@ -1124,6 +1273,11 @@ msgstr ""
"di alcuni degli avvertimenti duranta il processo di verifica."
#~ msgid ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+#~ msgstr ""
+#~ "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+
+#~ msgid ""
#~ "Verify the date of the signature to make sure that you downloaded the "
#~ "latest version."
#~ msgstr ""
diff --git a/wiki/src/install/inc/steps/download.inline.pt.po b/wiki/src/install/inc/steps/download.inline.pt.po
index 2ffb0e0..b3aa82f 100644
--- a/wiki/src/install/inc/steps/download.inline.pt.po
+++ b/wiki/src/install/inc/steps/download.inline.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-25 17:35+0200\n"
+"POT-Creation-Date: 2018-08-20 14:06+0000\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,22 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails"
msgstr ""
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img\" class=\"use-mirror-pool btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] USB image (<span class=\"remove-extra-space\">[[!"
+"inline pages=\"inc/stable_amd64_img_size\" raw=\"yes\" sort=\"age\"]]</"
+"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes"
+"\" sort=\"age\"]]\" id=\"download-img\" class=\"use-mirror-pool-on-retry btn "
+"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image (<span class="
+"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_img_size\" raw="
+"\"yes\" sort=\"age\"]]</span>)</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
@@ -223,6 +238,13 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><div><p>
msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_url\" raw=\"yes\" sort=\"age"
+"\"]]\" id=\"download-img-again\" class=\"use-mirror-pool-on-retry\">Please "
+"try to download again&hellip;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div><div><p>
+msgid ""
"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort=\"age"
"\"]]\" id=\"download-iso-again\" class=\"use-mirror-pool-on-retry\">Please "
"try to download again&hellip;</a>"
@@ -270,13 +292,13 @@ msgid ""
"computer&hellip;"
msgstr ""
-#. type: Content of: <div><div><div><h3>
+#. type: Content of: <div><div><div><div><h3>
msgid ""
"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
"dvd upgrade-tails\">1.</span>3</span>Continue <span class=\"debian windows "
"linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
-"\">upgrading</span> <span class=\"download-only\">installing or upgrading</"
-"span>"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
msgstr ""
#. type: Content of: <div><div><div><div>
@@ -401,15 +423,15 @@ msgid "[[Install from macOS and the command line|install/mac/usb]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Burn on a DVD|dvd]]"
+msgid "[[Upgrade inside Tails|upgrade/tails]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
+msgid "[[Burn on a DVD|dvd]]"
msgstr ""
#. type: Content of: <div><div><div><div><ul><li>
-msgid "[[Upgrade inside Tails|upgrade/tails]]"
+msgid "[[Run in a virtual machine|doc/advanced_topics/virtualization]]"
msgstr ""
#. type: Content of: <div><div><div><p>
@@ -501,6 +523,10 @@ msgstr ""
msgid "<code>https://tails.boum.org/install/download/</code>"
msgstr ""
+#. type: Content of: <div><div><div><p>
+msgid "<code>https://tails.boum.org/install/download-iso/</code>"
+msgstr ""
+
#. type: Content of: <div><div><h2>
msgid "BitTorrent download"
msgstr ""
@@ -538,12 +564,20 @@ msgid ""
"dvd upgrade-tails\">1.</span>1</span>Download Tails (Torrent file)"
msgstr ""
-#. type: Content of: <div><div><div>
+#. type: Content of: <div><div><div><div>
msgid ""
-"<a href=\"[[!inline pages=\"inc/stable_amd64_torrent_url\" raw=\"yes\" sort="
-"\"age\"]]\" id=\"download-torrent\" class=\"btn btn-primary inline-block "
-"indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" raw="
-"\"yes\" sort=\"age\"]] Torrent file</a>"
+"<a href=\"[[!inline pages=\"inc/stable_amd64_img_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-img-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for USB image</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid ""
+"<a href=\"[[!inline pages=\"inc/stable_amd64_iso_torrent_url\" raw=\"yes\" "
+"sort=\"age\"]]\" id=\"download-iso-torrent\" class=\"btn btn-primary inline-"
+"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
+"raw=\"yes\" sort=\"age\"]] Torrent file for ISO image</a>"
msgstr ""
#. type: Content of: <div><div><div><h3>
@@ -558,11 +592,22 @@ msgid ""
"complete."
msgstr ""
+#. type: Content of: <div><div><div><h3>
+msgid ""
+"<span class=\"step-number\"><span class=\"debian windows linux mac-usb mac-"
+"dvd dvd vm upgrade-tails\">1.</span>3</span>Continue <span class=\"debian "
+"windows linux mac-usb mac-dvd\">installing</span> <span class=\"upgrade-tails"
+"\">upgrading</span> <span class=\"download-only-img download-only-iso"
+"\">installing or upgrading</span>"
+msgstr ""
+
#. type: Content of: <div><div><div><p>
msgid ""
"Open and download the Torrent file with your BitTorrent client. It contains "
"the Tails [[!inline pages=\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age"
-"\"]] ISO image that you will use in the next step."
+"\"]] <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails\">USB</"
+"span> <span class=\"debian windows linux mac-usb mac-dvd upgrade-tails"
+"\">ISO</span> image that you will use in the next step."
msgstr ""
#. type: Content of: <div><h2>
@@ -581,10 +626,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Download the <a href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" raw="
-"\"yes\" sort=\"age\"]]'> Tails [[!inline pages=\"inc/stable_amd64_version\" "
-"raw=\"yes\" sort=\"age\"]] OpenPGP signature</a> and save it to the same "
-"folder where you saved the ISO image."
+"Download the <a class=\"debian windows linux mac-usb upgrade-tails\" "
+"href='[[!inline pages=\"inc/stable_amd64_img_sig_url\" raw=\"yes\" sort=\"age"
+"\"]]'>OpenPGP signature for the Tails [[!inline pages=\"inc/"
+"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] USB image</a> <a class="
+"\"mac-dvd dvd vm\" href='[[!inline pages=\"inc/stable_amd64_iso_sig_url\" "
+"raw=\"yes\" sort=\"age\"]]'>OpenPGP signature for the Tails [[!inline pages="
+"\"inc/stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image</a> and "
+"save it to the same folder where you saved the image."
msgstr ""
#. type: Content of: <div><h3>
@@ -658,7 +707,7 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"Then the ISO image is still correct according to the signing key that you "
+"Then the image is still correct according to the signing key that you "
"downloaded. To remove this warning you need to <a href=\"#wot\">authenticate "
"the signing key through the OpenPGP Web of Trust</a>."
msgstr ""
@@ -674,12 +723,12 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
"Open <span class=\"application\">Finder</span> and navigate to the folder "
-"where you saved the ISO image and the signature."
+"where you saved the image and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Right-click on the ISO image and choose <span class=\"guimenuchoice\"> <span "
+"Right-click on the image and choose <span class=\"guimenuchoice\"> <span "
"class=\"guisubmenu\">Services</span> ▸ <span class=\"guimenuitem\">OpenPGP: "
"Verify Signature of File</span></span>."
msgstr ""
@@ -694,8 +743,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open the file browser and navigate to the folder where you saved the ISO "
-"image and the signature."
+"Open the file browser and navigate to the folder where you saved the image "
+"and the signature."
msgstr ""
#. type: Content of: <div><ol><li>
@@ -705,7 +754,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li>
-msgid "The verification of the ISO image starts automatically:"
+msgid "The verification of the image starts automatically:"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -719,7 +768,15 @@ msgid ""
msgstr ""
#. type: Content of: <div><ol><li><p>
-msgid "[[!img install/inc/screenshots/notification_in_tails.png link=\"no\"]]"
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="
+"\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="
+"\"no\"]]"
msgstr ""
#. type: Content of: <div>
@@ -732,8 +789,8 @@ msgstr ""
#. type: Content of: <div><ol><li>
msgid ""
-"Open a terminal and navigate to the folder where you saved the ISO image and "
-"the signature."
+"Open a terminal and navigate to the folder where you saved the image and the "
+"signature."
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -742,7 +799,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_verify\" raw=\"yes\" sort=\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_verify\" raw=\"yes\" sort=\"age"
+"\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -751,8 +815,14 @@ msgstr ""
#. type: Content of: <div><ol><li><p>
msgid ""
-"[[!inline pages=\"inc/stable_amd64_gpg_signature_output\" raw=\"yes\" sort="
-"\"age\"]]"
+"[[!inline pages=\"inc/stable_amd64_img_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
+msgstr ""
+
+#. type: Content of: <div><ol><li><p>
+msgid ""
+"[[!inline pages=\"inc/stable_amd64_iso_gpg_signature_output\" raw=\"yes\" "
+"sort=\"age\"]]"
msgstr ""
#. type: Content of: <div><ol><li><p>
@@ -827,10 +897,10 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"If you are verifying an ISO image from inside Tails, for example, to do a "
-"manual upgrade, then you already have the Tails signing key. You can trust "
-"this signing key as much as you already trust your Tails installation since "
-"this signing key is included in your Tails installation."
+"If you are verifying an image from inside Tails, for example, to do a manual "
+"upgrade, then you already have the Tails signing key. You can trust this "
+"signing key as much as you already trust your Tails installation since this "
+"signing key is included in your Tails installation."
msgstr ""
#. type: Content of: <div><p>
diff --git a/wiki/src/install/inc/stylesheets/assistant.css b/wiki/src/install/inc/stylesheets/assistant.css
index 88eb0b3..f28b65a 100644
--- a/wiki/src/install/inc/stylesheets/assistant.css
+++ b/wiki/src/install/inc/stylesheets/assistant.css
@@ -67,14 +67,6 @@ h3, h4, p, ul {
margin-bottom: 1.5em;
}
-p, h3, h4 {
- color: #505050;
-}
-
-ul {
- color: black;
-}
-
ul {
padding-left: 20px;
}
@@ -118,7 +110,7 @@ td, th {
/* Hide all scenario-dependent bits by default. */
-.clone, .usb, .dvd, .vm, .download-only,
+.clone, .usb, .dvd, .vm, .download-only-img, .download-only-iso,
.install-clone,
.windows, .windows-usb,
.mac, .mac-usb, .mac-dvd, .mac-clone,
diff --git a/wiki/src/install/inc/stylesheets/download-only-img.css b/wiki/src/install/inc/stylesheets/download-only-img.css
new file mode 100644
index 0000000..efdf725
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/download-only-img.css
@@ -0,0 +1,11 @@
+span.download-only-img, ul.download-only-img {
+ display: inline;
+}
+
+div.download-only-img, p.download-only-img {
+ display: block;
+}
+
+#pagebody h1 {
+ display: none;
+}
diff --git a/wiki/src/install/inc/stylesheets/download-only-iso.css b/wiki/src/install/inc/stylesheets/download-only-iso.css
new file mode 100644
index 0000000..4457760
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/download-only-iso.css
@@ -0,0 +1,11 @@
+span.download-only-iso, ul.download-only-iso {
+ display: inline;
+}
+
+div.download-only-iso, p.download-only-iso {
+ display: block;
+}
+
+#pagebody h1 {
+ display: none;
+}
diff --git a/wiki/src/install/inc/stylesheets/download-only.css b/wiki/src/install/inc/stylesheets/download-only.css
deleted file mode 100644
index c58a3ab..0000000
--- a/wiki/src/install/inc/stylesheets/download-only.css
+++ /dev/null
@@ -1,11 +0,0 @@
-span.download-only, ul.download-only {
- display: inline;
-}
-
-p.download-only {
- display: block;
-}
-
-#pagebody h1 {
- display: none;
-}
diff --git a/wiki/src/install/inc/stylesheets/download.css b/wiki/src/install/inc/stylesheets/download.css
index 434ca0c..e1c131d 100644
--- a/wiki/src/install/inc/stylesheets/download.css
+++ b/wiki/src/install/inc/stylesheets/download.css
@@ -74,7 +74,7 @@ span.step-number {
margin-left: 35px !important;
}
-#step-download-iso, #step-download-torrent {
+#step-download-direct, #step-download-torrent {
min-height: 7em;
}
diff --git a/wiki/src/install/inc/stylesheets/overview.css b/wiki/src/install/inc/stylesheets/overview.css
index 95cf425..1ea199b 100644
--- a/wiki/src/install/inc/stylesheets/overview.css
+++ b/wiki/src/install/inc/stylesheets/overview.css
@@ -19,12 +19,6 @@
margin-bottom: 0px;
}
-#steps .caption {
- position: absolute;
- top: 110px;
- width: 100%;
-}
-
#needs .thumbnail img {
width: 100px;
}
@@ -33,23 +27,9 @@
width: 150px;
}
-#steps ol {
- list-style-type: none;
- margin-left: 0;
- max-width: none;
-}
-
-#steps h4 {
- padding: 10px 0;
- margin: 0px;
- font-size: 1.7em;
- color: black;
-}
-
#needs h3, #steps h3 {
padding: 10px 0;
display: inline-block;
font-size: 15px;
- color: darkgrey;
margin-bottom: 0;
}
diff --git a/wiki/src/install/linux.de.po b/wiki/src/install/linux.de.po
index 09d0353..475291f 100644
--- a/wiki/src/install/linux.de.po
+++ b/wiki/src/install/linux.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2017-02-09 21:06+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -63,18 +63,6 @@ msgstr "Sie brauchen:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Warum zwei?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -83,7 +71,9 @@ msgstr ""
"small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 Stunde zum Installieren"
#. type: Content of: <div><div>
@@ -95,7 +85,23 @@ msgid "Install from Linux"
msgstr "Installation unter Linux"
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
+msgstr "|linux/usb-overview]]"
+
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr ""
+
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|expert/usb-overview]]"
msgstr "|linux/usb-overview]]"
#. type: Content of: <div><div>
@@ -110,6 +116,17 @@ msgstr "[[Tails auf eine DVD brennen|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two"
+#~ "\" text=\"Warum zwei?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!"
+#~ "toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/"
+#~ "why_two.inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#~ msgid "[[Back|install/os]]"
#~ msgstr "[[Zurück|install/os]]"
diff --git a/wiki/src/install/linux.es.po b/wiki/src/install/linux.es.po
index 8a3524b..a7f2ace 100644
--- a/wiki/src/install/linux.es.po
+++ b/wiki/src/install/linux.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-13 22:05+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/linux/"
@@ -26,9 +26,9 @@ msgid ""
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" "
"title=\"\"]]"
msgstr ""
-"[[!meta title=\"Otros Linux (Red Hat, Fedora, etc.)\"]] [[!meta robots=\""
-"noindex\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\""
-"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
+"[[!meta title=\"Otros Linux (Red Hat, Fedora, etc.)\"]] [[!meta robots="
+"\"noindex\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title="
+"\"\"]] [[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/linux\" rel=\"stylesheet\" "
"title=\"\"]]"
@@ -56,18 +56,6 @@ msgstr "Necesitas:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 memorias USB <small>(de al menos 8 GB)</small>&nbsp; [[!toggle id=\"why_two"
-"\" text=\"¿Por qué 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
-"id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
-"inline.es\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -75,7 +63,9 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 hora para instalar"
#. type: Content of: <div><div>
@@ -87,9 +77,23 @@ msgid "Install from Linux"
msgstr "Instalar desde Linux"
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
msgstr "|linux/usb-overview]]"
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr "<small>Instala desde Debian, Ubuntu o Mint usando"
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr "la</small> línea de comandos <small> y </small> GnuPG"
+
+#. type: Content of: <div><div>
+msgid "|expert/usb-overview]]"
+msgstr "|expert/usb-overview]]"
+
#. type: Content of: <div><div>
msgid "You can also:"
msgstr "También puedes:"
@@ -102,6 +106,17 @@ msgstr "[[Grabar Tails en un DVD|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 memorias USB <small>(de al menos 8 GB)</small>&nbsp; [[!toggle id="
+#~ "\"why_two\" text=\"¿Por qué 2?\"]] [[!toggleable id=\"why_two\" text="
+#~ "\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/"
+#~ "inc/router/why_two.inline.es\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#~ msgid "[[Back|install/os]]"
#~ msgstr "[[Volver|install/os]]"
diff --git a/wiki/src/install/linux.fa.po b/wiki/src/install/linux.fa.po
index eca4251..f8f0649 100644
--- a/wiki/src/install/linux.fa.po
+++ b/wiki/src/install/linux.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+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"
@@ -48,20 +48,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -73,7 +65,19 @@ msgid "Install from Linux"
msgstr ""
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "|expert/usb-overview]]"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/linux.fr.po b/wiki/src/install/linux.fr.po
index 01f6984..6c48443 100644
--- a/wiki/src/install/linux.fr.po
+++ b/wiki/src/install/linux.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-16 09:18+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -54,18 +54,6 @@ msgstr "Vous avez besoin de :"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
-"id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
-"inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -74,7 +62,9 @@ msgstr ""
"small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 heure pour l'installation"
#. type: Content of: <div><div>
@@ -86,9 +76,23 @@ msgid "Install from Linux"
msgstr "Installer depuis Linux"
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
msgstr "|linux/usb-overview]]"
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr "<small>Installer depuis Debian, Ubuntu ou Mint avec"
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr "la</small> ligne de commande <small>et</small> GnuPG"
+
+#. type: Content of: <div><div>
+msgid "|expert/usb-overview]]"
+msgstr "|expert/usb-overview]]"
+
#. type: Content of: <div><div>
msgid "You can also:"
msgstr "Vous pouvez également :"
@@ -100,3 +104,14 @@ msgstr "[[Graver Tails sur un DVD|dvd-download]]"
#. type: Content of: <div><div><ul><li>
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Utiliser Tails dans une machine virtuelle|vm-download]]"
+
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!"
+#~ "toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/"
+#~ "why_two.inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/linux.html b/wiki/src/install/linux.html
index f8cc23a..72e7db9 100644
--- a/wiki/src/install/linux.html
+++ b/wiki/src/install/linux.html
@@ -24,15 +24,8 @@
<h4>You need:</h4>
<ul>
- <li>2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
-
- [[!toggleable id="why_two" text="""
- [[!toggle id="why_two" text="X"]]
- [[!inline pages="install/inc/router/why_two.inline" raw="yes" sort="age"]]
- """]]
- </li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
- <li>1 hour to install</li>
+ <li>½ hour to install</li>
</ul>
[[
@@ -41,6 +34,12 @@
</div>
|linux/usb-overview]]
+ [[
+ <div class="panel panel-primary">
+ <div class="panel-body two-lines"><small>Install from Debian, Ubuntu, or Mint using<br />the</small> command line <small>and</small> GnuPG</div>
+ </div>
+ |expert/usb-overview]]
+
</div>
</div>
diff --git a/wiki/src/install/linux.it.po b/wiki/src/install/linux.it.po
index 446e945..7ff12a4 100644
--- a/wiki/src/install/linux.it.po
+++ b/wiki/src/install/linux.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2017-02-09 21:07+0100\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -63,18 +63,6 @@ msgstr "Ti serve:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 chiavette USB <small>(minimo 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -82,7 +70,9 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 ora per installare"
#. type: Content of: <div><div>
@@ -94,7 +84,23 @@ msgid "Install from Linux"
msgstr "Installa da Linux"
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
+msgstr "|linux/usb-overview]]"
+
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr ""
+
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|linux/usb-overview]]"
+msgid "|expert/usb-overview]]"
msgstr "|linux/usb-overview]]"
#. type: Content of: <div><div>
@@ -109,11 +115,22 @@ msgstr "[[Masterizzare Tails su un DVD|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Avviare Tails su una macchina virtuale|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 chiavette USB <small>(minimo 8 GB)</small>&nbsp;[[!toggle id=\"why_two"
+#~ "\" text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!"
+#~ "toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/"
+#~ "why_two.inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#, fuzzy
#~ msgid "Other <strong>Linux</strong> <small>(Red Hat, Fedora, etc.)</small>"
#~ msgstr ""
-#~ "<strong>Altre distribuzioni Linux</strong> <small>(Red Hat, Fedora, etc.)"
-#~ "</small>"
+#~ "<strong>Altre distribuzioni Linux</strong> <small>(Red Hat, Fedora, "
+#~ "etc.)</small>"
#~ msgid "</small>"
#~ msgstr "</small>"
diff --git a/wiki/src/install/linux.pt.po b/wiki/src/install/linux.pt.po
index 48fefb6..6d1234b 100644
--- a/wiki/src/install/linux.pt.po
+++ b/wiki/src/install/linux.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-02-09 11:59+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
@@ -51,18 +51,6 @@ msgstr "Você precisa de:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"pt\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -70,7 +58,7 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -82,7 +70,19 @@ msgid "Install from Linux"
msgstr ""
#. type: Content of: <div><div>
-msgid "|linux/usb-overview]]"
+msgid "|linux/usb-overview]] [["
+msgstr ""
+
+#. type: Content of: <div><div><div><div><small>
+msgid "<small>Install from Debian, Ubuntu, or Mint using"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+msgid "the</small> command line <small>and</small> GnuPG"
+msgstr ""
+
+#. type: Content of: <div><div>
+msgid "|expert/usb-overview]]"
msgstr ""
#. type: Content of: <div><div>
@@ -96,3 +96,14 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
+
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline.pt\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/mac.de.po b/wiki/src/install/mac.de.po
index 6579d2a..4cc45f8 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: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2016-04-11 17:06+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -36,125 +36,146 @@ msgstr ""
"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline.de\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"Tails läuft nicht auf jedem Mac-Modell und Sie müssen möglicherweise "
-"<strong>andere Installationsvorgehensweisen</strong> versuchen."
-#. type: Content of: <p>
-msgid "At the end, maybe:"
-msgstr "Möglicherweise wird zum Schluss:"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "Try cloning from another Tails"
+msgid "Install from another Tails"
+msgstr "Versuchen Sie von einem anderen Tails zu klonen"
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
-msgstr "Tails <strong>perfekt</strong> funktionieren!"
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|mac/clone-overview]]"
+msgid "|install/mac/clone-overview]]"
+msgstr "|mac/clone-overview]]"
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-"es Ihnen möglich sein, Tails mit <strong>einigen fehlenden Grundfunktionen</"
-"strong> zu starten."
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#. type: Content of: <div><div><h4>
+msgid "You need:"
msgstr ""
-"es Ihnen möglich sein, Tails mit <strong>W-LAN- oder Grafikproblemen</"
-"strong> zu starten."
-
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
-msgstr "es <strong>unmöglich</strong> sein, Tails auf Ihrem Mac zu starten."
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
-msgstr "Nichtsdestotrotz, bereit, einen Versuch zu wagen?"
-
-#. type: Content of: <ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "If you know someone of trust who uses Tails already, you can try "
-#| "installing your USB stick by copying from it. Make sure that this Tails "
-#| "is up-to-date."
+#. type: Content of: <div><div><ul><li>
msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
msgstr ""
-"Wenn Sie eine Person kennen, die bereits Tails benutzt und der Sie "
-"vertrauen, können Sie versuchen, Tails durch das Kopieren davon zu zu "
-"installieren. Stellen Sie sicher, dass das Tails auf dem aktuellsten Stand "
-"ist."
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "[["
msgstr "[["
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
-msgstr "Versuchen Sie von einem anderen Tails zu klonen"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "<small>Install from</small>"
+msgid "Install from macOS"
+msgstr "<small>Installation unter</small>"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
-msgstr "|mac/clone-overview]]"
+#. type: Content of: <div><div>
+msgid "|mac/usb-overview]]"
+msgstr "|mac/usb-overview]]"
+
+#. type: Content of: <div><div>
+msgid "You can also:"
+msgstr "Sie können auch:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><div><ul><li>
#, fuzzy
-#| msgid ""
-#| "If you don't know anyone who uses Tails or if you tried to clone and "
-#| "failed starting, then you can try this other 3 methods:"
-msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
-msgstr ""
-"Wenn Sie keine Person kennen, die Tails benutzt oder wenn Sie das Klonen "
-"versucht haben und das Starten fehlgeschlagen ist, können Sie die folgenden "
-"drei Methoden versuchen:"
+#| msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr "<small>Installation unter</small>"
+#. type: Content of: <div><div><ul><li>
+msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr "Windows oder Linux"
+#~ msgid ""
+#~ "Tails is not working on every Mac model and you might have to try "
+#~ "<strong>different installation methods</strong>."
+#~ msgstr ""
+#~ "Tails läuft nicht auf jedem Mac-Modell und Sie müssen möglicherweise "
+#~ "<strong>andere Installationsvorgehensweisen</strong> versuchen."
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr "|install]]"
+#~ msgid "At the end, maybe:"
+#~ msgstr "Möglicherweise wird zum Schluss:"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr "Eine DVD brennen"
+#~ msgid "Tails will work <strong>perfectly</strong>!"
+#~ msgstr "Tails <strong>perfekt</strong> funktionieren!"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr "<small>und anschließend installieren</small>"
+#~ msgid ""
+#~ "You will start Tails with <strong>some core features missing</strong>."
+#~ msgstr ""
+#~ "es Ihnen möglich sein, Tails mit <strong>einigen fehlenden "
+#~ "Grundfunktionen</strong> zu starten."
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
-msgstr "|mac/dvd-overview]]"
+#~ msgid ""
+#~ "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#~ msgstr ""
+#~ "es Ihnen möglich sein, Tails mit <strong>W-LAN- oder Grafikproblemen</"
+#~ "strong> zu starten."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
-msgstr "<small>Installation mit</small>"
+#~ msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#~ msgstr "es <strong>unmöglich</strong> sein, Tails auf Ihrem Mac zu starten."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
-msgstr "der Kommandozeile"
+#~ msgid "Anyway, ready to give it a try?"
+#~ msgstr "Nichtsdestotrotz, bereit, einen Versuch zu wagen?"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/usb-overview]]"
-msgstr "|mac/usb-overview]]"
+#, fuzzy
+#~| msgid ""
+#~| "If you know someone of trust who uses Tails already, you can try "
+#~| "installing your USB stick by copying from it. Make sure that this Tails "
+#~| "is up-to-date."
+#~ msgid ""
+#~ "If you know someone you trust who uses Tails already, you can try "
+#~ "installing your Tails by cloning from their Tails."
+#~ msgstr ""
+#~ "Wenn Sie eine Person kennen, die bereits Tails benutzt und der Sie "
+#~ "vertrauen, können Sie versuchen, Tails durch das Kopieren davon zu zu "
+#~ "installieren. Stellen Sie sicher, dass das Tails auf dem aktuellsten "
+#~ "Stand ist."
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "Sie können auch:"
+#, fuzzy
+#~| msgid ""
+#~| "If you don't know anyone who uses Tails or if you tried to clone and "
+#~| "failed starting, then you can try this other 3 methods:"
+#~ msgid ""
+#~ "If you don't know anyone who uses Tails or if you tried to clone and "
+#~ "failed starting, then you can try these other 3 methods:"
+#~ msgstr ""
+#~ "Wenn Sie keine Person kennen, die Tails benutzt oder wenn Sie das Klonen "
+#~ "versucht haben und das Starten fehlgeschlagen ist, können Sie die "
+#~ "folgenden drei Methoden versuchen:"
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
+#~ msgid "Windows or Linux"
+#~ msgstr "Windows oder Linux"
+
+#~ msgid "|install]]"
+#~ msgstr "|install]]"
+
+#~ msgid "Burn a DVD"
+#~ msgstr "Eine DVD brennen"
+
+#~ msgid "<small>and then install</small>"
+#~ msgstr "<small>und anschließend installieren</small>"
+
+#~ msgid "|mac/dvd-overview]]"
+#~ msgstr "|mac/dvd-overview]]"
+
+#~ msgid "<small>Install using</small>"
+#~ msgstr "<small>Installation mit</small>"
+
+#~ msgid "the command line"
+#~ msgstr "der Kommandozeile"
#~ msgid "|os]]"
#~ msgstr "|os]]"
diff --git a/wiki/src/install/mac.es.po b/wiki/src/install/mac.es.po
index 6cba67f..9bc8b0c 100644
--- a/wiki/src/install/mac.es.po
+++ b/wiki/src/install/mac.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-09 18:20+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/mac/"
@@ -30,111 +30,132 @@ msgstr ""
"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
"\"inc/stylesheets/router-mac\" rel=\"stylesheet\" title=\"\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"Tails no funciona en todos los modelos de Mac y puede que necesites intentar "
-"<strong>diferentes métodos de instalación</strong>."
-#. type: Content of: <p>
-msgid "At the end, maybe:"
-msgstr "Al fin y al cabo, tal vez:"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "Try cloning from another Tails"
+msgid "Install from another Tails"
+msgstr "Intentar clonar desde otro Tails"
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
-msgstr "¡Tails funcione <strong>perfectamente</strong>!"
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|mac/clone-overview]]"
+msgid "|install/mac/clone-overview]]"
+msgstr "|mac/clone-overview]]"
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-"Iniciarás Tails con <strong>algunas características principales faltantes</"
-"strong>."
-
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
-msgstr "Iniciarás Tails con <strong>problemas de Wi-Fi o gráficos</strong>."
-
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
-msgstr "Será <strong>imposible</strong> iniciar Tails en tu Mac."
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
-msgstr "De todas formas, ¿listo para intentarlo?"
+#. type: Content of: <div><div><h4>
+msgid "You need:"
+msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><div><ul><li>
msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
msgstr ""
-"Si conoces a alguien en quien confías que ya está utilizando Tails, puedes "
-"instalar tu memoria USB de Tails clonando la suya."
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "[["
msgstr "[["
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
-msgstr "Intentar clonar desde otro Tails"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "<small>Install from</small>"
+msgid "Install from macOS"
+msgstr "<small>Instalar desde</small>"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
-msgstr "|mac/clone-overview]]"
+#. type: Content of: <div><div>
+msgid "|mac/usb-overview]]"
+msgstr "|mac/usb-overview]]"
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
-msgstr ""
-"Si no conoces alguien que use Tails o si intentaste clonar y falló al "
-"iniciar, entonces puedes intentar estos otros 3 métodos:"
+#. type: Content of: <div><div>
+msgid "You can also:"
+msgstr "También puedes:"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr "<small>Instalar desde</small>"
+#. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr "Windows o Linux"
+#. type: Content of: <div><div><ul><li>
+msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr "|install]]"
+#~ msgid ""
+#~ "Tails is not working on every Mac model and you might have to try "
+#~ "<strong>different installation methods</strong>."
+#~ msgstr ""
+#~ "Tails no funciona en todos los modelos de Mac y puede que necesites "
+#~ "intentar <strong>diferentes métodos de instalación</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr "Grabar un DVD"
+#~ msgid "At the end, maybe:"
+#~ msgstr "Al fin y al cabo, tal vez:"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr "<small>y luego instalar</small>"
+#~ msgid "Tails will work <strong>perfectly</strong>!"
+#~ msgstr "¡Tails funcione <strong>perfectamente</strong>!"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
-msgstr "|mac/dvd-overview]]"
+#~ msgid ""
+#~ "You will start Tails with <strong>some core features missing</strong>."
+#~ msgstr ""
+#~ "Iniciarás Tails con <strong>algunas características principales "
+#~ "faltantes</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
-msgstr "<small>Instalar usando</small>"
+#~ msgid ""
+#~ "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#~ msgstr "Iniciarás Tails con <strong>problemas de Wi-Fi o gráficos</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
-msgstr "la linea de comandos"
+#~ msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#~ msgstr "Será <strong>imposible</strong> iniciar Tails en tu Mac."
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/usb-overview]]"
-msgstr "|mac/usb-overview]]"
+#~ msgid "Anyway, ready to give it a try?"
+#~ msgstr "De todas formas, ¿listo para intentarlo?"
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "También puedes:"
+#~ msgid ""
+#~ "If you know someone you trust who uses Tails already, you can try "
+#~ "installing your Tails by cloning from their Tails."
+#~ msgstr ""
+#~ "Si conoces a alguien en quien confías que ya está utilizando Tails, "
+#~ "puedes instalar tu memoria USB de Tails clonando la suya."
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
+#~ msgid ""
+#~ "If you don't know anyone who uses Tails or if you tried to clone and "
+#~ "failed starting, then you can try these other 3 methods:"
+#~ msgstr ""
+#~ "Si no conoces alguien que use Tails o si intentaste clonar y falló al "
+#~ "iniciar, entonces puedes intentar estos otros 3 métodos:"
+
+#~ msgid "Windows or Linux"
+#~ msgstr "Windows o Linux"
+
+#~ msgid "|install]]"
+#~ msgstr "|install]]"
+
+#~ msgid "Burn a DVD"
+#~ msgstr "Grabar un DVD"
+
+#~ msgid "<small>and then install</small>"
+#~ msgstr "<small>y luego instalar</small>"
+
+#~ msgid "|mac/dvd-overview]]"
+#~ msgstr "|mac/dvd-overview]]"
+
+#~ msgid "<small>Install using</small>"
+#~ msgstr "<small>Instalar usando</small>"
+
+#~ msgid "the command line"
+#~ msgstr "la linea de comandos"
#~ msgid "|os]]"
#~ msgstr "|os]]"
diff --git a/wiki/src/install/mac.fa.po b/wiki/src/install/mac.fa.po
index 2973a46..d469637 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: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+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,93 +24,46 @@ msgid ""
"\"inc/stylesheets/router-mac\" rel=\"stylesheet\" title=\"\"]]"
msgstr ""
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "At the end, maybe:"
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#. type: Content of: <div><div><div><div>
+msgid "Install from another Tails"
msgstr ""
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
-msgstr ""
-
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "[["
+#. type: Content of: <div><div>
+msgid "|install/mac/clone-overview]]"
msgstr ""
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
+#. type: Content of: <div><div><h4>
+msgid "You need:"
msgstr ""
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><div><ul><li>
msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
msgstr ""
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
+#. type: Content of: <div><div>
+msgid "[["
msgstr ""
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
+#. type: Content of: <div><div><div><div>
+msgid "Install from macOS"
msgstr ""
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "|mac/usb-overview]]"
msgstr ""
@@ -119,5 +72,9 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
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 127bcdb..6c83d1b 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: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-16 09:01+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -28,111 +28,131 @@ msgstr ""
"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
"\"inc/stylesheets/router-mac\" rel=\"stylesheet\" title=\"\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"Tails ne fonctionne pas sur tous les modèles de Mac. Il vous faudra peut-"
-"être essayer <strong>plusieurs méthodes d'installation</strong>."
-#. type: Content of: <p>
-msgid "At the end, maybe:"
-msgstr "À la fin, il se peut que :"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "Try cloning from another Tails"
+msgid "Install from another Tails"
+msgstr "Essayer de cloner depuis un autre Tails"
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
-msgstr "Tails fonctionne <strong>parfaitement</strong> !"
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|mac/clone-overview]]"
+msgid "|install/mac/clone-overview]]"
+msgstr "|mac/clone-overview]]"
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-"Tails démarre avec <strong>sans certaines fonctionnalités cruciales</strong>."
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#. type: Content of: <div><div><h4>
+msgid "You need:"
msgstr ""
-"Tails démarre avec des <strong>problèmes de Wi-Fi ou d'affichage</strong>."
-
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
-msgstr "Il soit <strong>impossible</strong> de démarrer Tails sur votre Mac."
-
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
-msgstr "Envie de tenter votre chance ?"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><div><ul><li>
msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
-"Si vous connaissez une personne de confiance qui utilise déjà Tails, vous "
-"pouvez essayer d'installer votre Tails en copiant son Tails."
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
+msgstr ""
+
+#. type: Content of: <div><div>
msgid "[["
msgstr "[["
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
-msgstr "Essayer de cloner depuis un autre Tails"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "<small>Install from</small>"
+msgid "Install from macOS"
+msgstr "<small>Installer depuis</small>"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
-msgstr "|mac/clone-overview]]"
+#. type: Content of: <div><div>
+msgid "|mac/usb-overview]]"
+msgstr "|mac/usb-overview]]"
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
-msgstr ""
-"Si vous ne connaissez personne qui utilise Tails ou que votre clone ne "
-"démarre pas, vous pouvez essayer l'une de ces trois autres méthodes :"
+#. type: Content of: <div><div>
+msgid "You can also:"
+msgstr "Vous pouvez également :"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr "<small>Installer depuis</small>"
+#. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr "[[Exécuter Tails dans une machine virtuelle|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr "Windows ou Linux"
+#. type: Content of: <div><div><ul><li>
+msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgstr "[[Exécuter Tails dans une machine virtuelle|vm-download]]"
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr "|install]]"
+#~ msgid ""
+#~ "Tails is not working on every Mac model and you might have to try "
+#~ "<strong>different installation methods</strong>."
+#~ msgstr ""
+#~ "Tails ne fonctionne pas sur tous les modèles de Mac. Il vous faudra peut-"
+#~ "être essayer <strong>plusieurs méthodes d'installation</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr "Graver un DVD"
+#~ msgid "At the end, maybe:"
+#~ msgstr "À la fin, il se peut que :"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr "<small>et ensuite installer</small>"
+#~ msgid "Tails will work <strong>perfectly</strong>!"
+#~ msgstr "Tails fonctionne <strong>parfaitement</strong> !"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
-msgstr "|mac/dvd-overview]]"
+#~ msgid ""
+#~ "You will start Tails with <strong>some core features missing</strong>."
+#~ msgstr ""
+#~ "Tails démarre avec <strong>sans certaines fonctionnalités cruciales</"
+#~ "strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
-msgstr "<small>Installer en utilisant</small>"
+#~ msgid ""
+#~ "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#~ msgstr ""
+#~ "Tails démarre avec des <strong>problèmes de Wi-Fi ou d'affichage</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
-msgstr "la ligne de commande"
+#~ msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#~ msgstr ""
+#~ "Il soit <strong>impossible</strong> de démarrer Tails sur votre Mac."
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/usb-overview]]"
-msgstr "|mac/usb-overview]]"
+#~ msgid "Anyway, ready to give it a try?"
+#~ msgstr "Envie de tenter votre chance ?"
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "Vous pouvez également :"
+#~ msgid ""
+#~ "If you know someone you trust who uses Tails already, you can try "
+#~ "installing your Tails by cloning from their Tails."
+#~ msgstr ""
+#~ "Si vous connaissez une personne de confiance qui utilise déjà Tails, vous "
+#~ "pouvez essayer d'installer votre Tails en copiant son Tails."
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Exécuter Tails dans une machine virtuelle|vm-download]]"
+#~ msgid ""
+#~ "If you don't know anyone who uses Tails or if you tried to clone and "
+#~ "failed starting, then you can try these other 3 methods:"
+#~ msgstr ""
+#~ "Si vous ne connaissez personne qui utilise Tails ou que votre clone ne "
+#~ "démarre pas, vous pouvez essayer l'une de ces trois autres méthodes :"
+
+#~ msgid "Windows or Linux"
+#~ msgstr "Windows ou Linux"
+
+#~ msgid "Burn a DVD"
+#~ msgstr "Graver un DVD"
+
+#~ msgid "<small>and then install</small>"
+#~ msgstr "<small>et ensuite installer</small>"
+
+#~ msgid "|mac/dvd-overview]]"
+#~ msgstr "|mac/dvd-overview]]"
+
+#~ msgid "<small>Install using</small>"
+#~ msgstr "<small>Installer en utilisant</small>"
+
+#~ msgid "the command line"
+#~ msgstr "la ligne de commande"
#~ msgid "|os]]"
#~ msgstr "|os]]"
diff --git a/wiki/src/install/mac.html b/wiki/src/install/mac.html
index 5ca4455..36832ae 100644
--- a/wiki/src/install/mac.html
+++ b/wiki/src/install/mac.html
@@ -5,81 +5,46 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/router-mac" rel="stylesheet" title=""]]
-<p>Tails is not working on every Mac model and you might have to try <strong>different
-installation methods</strong>.</p>
+<div id="scenarios" class="row">
+ <div class="col-md-6">
-<p>At the end, maybe:</p>
-
-<ul>
- <li>Tails will work <strong>perfectly</strong>!</li>
- <li>You will start Tails with <strong>some core features missing</strong>.</li>
- <li>You will start Tails with <strong>Wi-Fi or graphics problems</strong>.</li>
- <li>It will be <strong>impossible</strong> to start Tails on your Mac.</li>
-</ul>
-
-<h2>Anyway, ready to give it a try?</h2>
-
-<ol class="mac_install">
- <li>
-
- <p>If you know someone you trust who uses Tails already, you can try installing your Tails by cloning from their Tails.</p>
-
- <div class="row">
- <div class="col-sm-8">
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body">Try cloning from another Tails</div>
- </div>
- |mac/clone-overview]]
+ [[!inline pages="install/inc/router/clone" raw="yes" sort="age"]]
+ [[
+ <div class="panel panel-primary">
+ <div class="panel-body">Install from another Tails</div>
</div>
- </div>
- </li>
- <li>
-
- <p>If you don't know anyone who uses Tails or if you tried to clone and
- failed starting, then you can try these other 3 methods:</p>
+ |install/mac/clone-overview]]
- <div class="row">
- <div class="col-sm-4">
+ </div>
+ <div class="col-md-6">
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines"><small>Install from</small><br />Windows or Linux</div>
- </div>
- |install]]
+ <h3>Download and install</h3>
- </div>
- <div class="col-sm-4">
+ <h4>You need:</h4>
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines">Burn a DVD <br /><small>and then install</small></div>
- </div>
- |mac/dvd-overview]]
+ <ul>
+ <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
+ <li>½ hour to install</li>
+ </ul>
+ [[
+ <div class="panel panel-primary">
+ <div class="panel-body">Install from macOS</div>
</div>
- <div class="col-sm-4">
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines"><small>Install using</small><br />the command line</div>
- </div>
- |mac/usb-overview]]
+ |mac/usb-overview]]
- </div>
- </div>
- </li>
-</ol>
+ </div>
+</div>
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
You can also:
- <ul>
- <li>[[Run Tails in a virtual machine|vm-download]]</li>
- </ul>
+ <ul>
+ <li>[[Burn Tails on a DVD|dvd-download]]</li>
+ <li>[[Run Tails in a virtual machine|vm-download]]</li>
+ </ul>
</div>
</div>
diff --git a/wiki/src/install/mac.it.po b/wiki/src/install/mac.it.po
index 263e408..b8742c5 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: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2016-07-29 14:54+0200\n"
"Last-Translator: transitails <transitails>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -36,121 +36,139 @@ msgstr ""
"\" rel=\"stylesheet\" title=\"\"]] [[!inline pages=\"install/inc/tails-"
"installation-assistant.inline.it\" raw=\"yes\" sort=\"age\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-"Tails non funziona sulla totalità dei modelli Mac e potresti dover provare "
-"<strong>differenti metodi di installazione</strong>."
-#. type: Content of: <p>
-msgid "At the end, maybe:"
-msgstr "Alla fine, forse:"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "Try cloning from another Tails"
+msgid "Install from another Tails"
+msgstr "Provare a clonare da un altro Tails"
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
-msgstr "Tails funziona <strong>perfettamente</strong>!"
+#. type: Content of: <div><div>
+#, fuzzy
+#| msgid "|mac/clone-overview]]"
+msgid "|install/mac/clone-overview]]"
+msgstr "|mac/clone-overview]]"
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-"Avvierai Tails <strong>senza alcune caratteristiche fondamentali</strong>."
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#. type: Content of: <div><div><h4>
+msgid "You need:"
msgstr ""
-"Avvierai Tails con <strong>problemi con il Wi-Fi o la grafica</strong>."
-
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
-msgstr "Sarà <strong>impossibile</strong> avviare Tails sul tuo Mac."
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
-msgstr "In ogni caso, sei pronta a fare un tentativo?"
-
-#. type: Content of: <ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "If you know someone of trust who uses Tails already, you can try "
-#| "installing your USB stick by copying from it. Make sure that this Tails "
-#| "is up-to-date."
+#. type: Content of: <div><div><ul><li>
msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
msgstr ""
-"Se c'è qualcuno di cui ti fidi che usa già Tails, puoi provare a installare "
-"la tua chiave USB copiandola da suo. Assicurati che questo Tails sia "
-"aggiornato."
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "[["
msgstr "[["
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
-msgstr "Provare a clonare da un altro Tails"
+#. type: Content of: <div><div><div><div>
+#, fuzzy
+#| msgid "<small>Install from</small>"
+msgid "Install from macOS"
+msgstr "<small>Installa da</small>"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
-msgstr "|mac/clone-overview]]"
+#. type: Content of: <div><div>
+msgid "|mac/usb-overview]]"
+msgstr "|mac/usb-overview]]"
+
+#. type: Content of: <div><div>
+msgid "You can also:"
+msgstr "Puoi anche:"
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><div><ul><li>
#, fuzzy
-#| msgid ""
-#| "If you don't know anyone who uses Tails or if you tried to clone and "
-#| "failed starting, then you can try this other 3 methods:"
-msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
-msgstr ""
-"Se non conosci nessuno che usa Tails o se hai provato a clonare e hai "
-"fallito durante l'avvio, puoi provare questi altre 3 metodi:"
+#| msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr "[[Usare Tails in una macchina virtuale|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr "<small>Installa da</small>"
+#. type: Content of: <div><div><ul><li>
+msgid "[[Run Tails in a virtual machine|vm-download]]"
+msgstr "[[Usare Tails in una macchina virtuale|vm-download]]"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr "Windows o Linux"
+#~ msgid ""
+#~ "Tails is not working on every Mac model and you might have to try "
+#~ "<strong>different installation methods</strong>."
+#~ msgstr ""
+#~ "Tails non funziona sulla totalità dei modelli Mac e potresti dover "
+#~ "provare <strong>differenti metodi di installazione</strong>."
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr ""
+#~ msgid "At the end, maybe:"
+#~ msgstr "Alla fine, forse:"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr "Masterizza un DVD"
+#~ msgid "Tails will work <strong>perfectly</strong>!"
+#~ msgstr "Tails funziona <strong>perfettamente</strong>!"
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr "<small>e poi installa</small>"
+#~ msgid ""
+#~ "You will start Tails with <strong>some core features missing</strong>."
+#~ msgstr ""
+#~ "Avvierai Tails <strong>senza alcune caratteristiche fondamentali</strong>."
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
-msgstr "|mac/dvd-overview]]"
+#~ msgid ""
+#~ "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#~ msgstr ""
+#~ "Avvierai Tails con <strong>problemi con il Wi-Fi o la grafica</strong>."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
-msgstr "<small>Installa usando</small>"
+#~ msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#~ msgstr "Sarà <strong>impossibile</strong> avviare Tails sul tuo Mac."
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
-msgstr "la riga di comando"
+#~ msgid "Anyway, ready to give it a try?"
+#~ msgstr "In ogni caso, sei pronta a fare un tentativo?"
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/usb-overview]]"
-msgstr "|mac/usb-overview]]"
+#, fuzzy
+#~| msgid ""
+#~| "If you know someone of trust who uses Tails already, you can try "
+#~| "installing your USB stick by copying from it. Make sure that this Tails "
+#~| "is up-to-date."
+#~ msgid ""
+#~ "If you know someone you trust who uses Tails already, you can try "
+#~ "installing your Tails by cloning from their Tails."
+#~ msgstr ""
+#~ "Se c'è qualcuno di cui ti fidi che usa già Tails, puoi provare a "
+#~ "installare la tua chiave USB copiandola da suo. Assicurati che questo "
+#~ "Tails sia aggiornato."
-#. type: Content of: <div><div>
-msgid "You can also:"
-msgstr "Puoi anche:"
+#, fuzzy
+#~| msgid ""
+#~| "If you don't know anyone who uses Tails or if you tried to clone and "
+#~| "failed starting, then you can try this other 3 methods:"
+#~ msgid ""
+#~ "If you don't know anyone who uses Tails or if you tried to clone and "
+#~ "failed starting, then you can try these other 3 methods:"
+#~ msgstr ""
+#~ "Se non conosci nessuno che usa Tails o se hai provato a clonare e hai "
+#~ "fallito durante l'avvio, puoi provare questi altre 3 metodi:"
-#. type: Content of: <div><div><ul><li>
-msgid "[[Run Tails in a virtual machine|vm-download]]"
-msgstr "[[Usare Tails in una macchina virtuale|vm-download]]"
+#~ msgid "Windows or Linux"
+#~ msgstr "Windows o Linux"
+
+#~ msgid "Burn a DVD"
+#~ msgstr "Masterizza un DVD"
+
+#~ msgid "<small>and then install</small>"
+#~ msgstr "<small>e poi installa</small>"
+
+#~ msgid "|mac/dvd-overview]]"
+#~ msgstr "|mac/dvd-overview]]"
+
+#~ msgid "<small>Install using</small>"
+#~ msgstr "<small>Installa usando</small>"
+
+#~ msgid "the command line"
+#~ msgstr "la riga di comando"
#~ msgid "|os]]"
#~ msgstr "|os]]"
diff --git a/wiki/src/install/mac.pt.po b/wiki/src/install/mac.pt.po
index 9512ff5..313e264 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"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-11 10:27+0200\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-04-27 10:37+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,93 +40,46 @@ msgstr ""
"pages=\"install/inc/tails-installation-assistant.inline.pt\" raw=\"yes\" "
"sort=\"age\"]]"
-#. type: Content of: <p>
+#. type: Content of: <div><div>
msgid ""
-"Tails is not working on every Mac model and you might have to try "
-"<strong>different installation methods</strong>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "At the end, maybe:"
+"[[!inline pages=\"install/inc/router/clone\" raw=\"yes\" sort=\"age\"]] [["
msgstr ""
-#. type: Content of: <ul><li>
-msgid "Tails will work <strong>perfectly</strong>!"
+#. type: Content of: <div><div><div><div>
+msgid "Install from another Tails"
msgstr ""
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>some core features missing</strong>."
+#. type: Content of: <div><div>
+msgid "|install/mac/clone-overview]]"
msgstr ""
-#. type: Content of: <ul><li>
-msgid "You will start Tails with <strong>Wi-Fi or graphics problems</strong>."
+#. type: Content of: <div><div><h3>
+msgid "Download and install"
msgstr ""
-#. type: Content of: <ul><li>
-msgid "It will be <strong>impossible</strong> to start Tails on your Mac."
+#. type: Content of: <div><div><h4>
+msgid "You need:"
msgstr ""
-#. type: Content of: <h2>
-msgid "Anyway, ready to give it a try?"
+#. type: Content of: <div><div><ul><li>
+msgid ""
+"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
+"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you know someone you trust who uses Tails already, you can try installing "
-"your Tails by cloning from their Tails."
+#. type: Content of: <div><div><ul><li>
+msgid "½ hour to install"
msgstr ""
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "[["
msgstr "[["
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Try cloning from another Tails"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/clone-overview]]"
-msgstr ""
-
-#. type: Content of: <ol><li><p>
-msgid ""
-"If you don't know anyone who uses Tails or if you tried to clone and failed "
-"starting, then you can try these other 3 methods:"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install from</small>"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Windows or Linux"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "|install]]"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "Burn a DVD"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>and then install</small>"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
-msgid "|mac/dvd-overview]]"
+#. type: Content of: <div><div><div><div>
+msgid "Install from macOS"
msgstr ""
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "<small>Install using</small>"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div><div><div>
-msgid "the command line"
-msgstr ""
-
-#. type: Content of: <ol><li><div><div>
+#. type: Content of: <div><div>
msgid "|mac/usb-overview]]"
msgstr ""
@@ -135,5 +88,9 @@ msgid "You can also:"
msgstr ""
#. type: Content of: <div><div><ul><li>
+msgid "[[Burn Tails on a DVD|dvd-download]]"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
diff --git a/wiki/src/install/win.de.po b/wiki/src/install/win.de.po
index 9fc5782..73faaa6 100644
--- a/wiki/src/install/win.de.po
+++ b/wiki/src/install/win.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2017-02-09 21:11+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -61,18 +61,6 @@ msgstr "Sie brauchen:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Warum 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -81,7 +69,9 @@ msgstr ""
"small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 Stunde zum Installieren"
#. type: Content of: <div><div>
@@ -108,6 +98,17 @@ msgstr "[[Tails auf eine DVD brennen|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Tails in einer virtuellen Maschine laufen lassen|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 USB-Sticks <small>(mindestens 8 GB)</small>&nbsp;[[!toggle id=\"why_two"
+#~ "\" text=\"Warum 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
+#~ "id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline.de\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#~ msgid "[[Back|install/os]]"
#~ msgstr "[[Zurück|install/os]]"
diff --git a/wiki/src/install/win.es.po b/wiki/src/install/win.es.po
index f9a12bd..aa44271 100644
--- a/wiki/src/install/win.es.po
+++ b/wiki/src/install/win.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-04-26 06:38+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/win/"
@@ -26,9 +26,9 @@ msgid ""
"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]]"
msgstr ""
"[[!meta title=\"Windows\"]] [[!meta robots=\"noindex\"]] [[!meta stylesheet="
-"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\""
-"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta "
-"stylesheet=\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]]"
+"\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"inc/"
+"stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!meta stylesheet="
+"\"inc/stylesheets/windows\" rel=\"stylesheet\" title=\"\"]]"
#. type: Content of: <div><div>
msgid ""
@@ -54,18 +54,6 @@ msgstr "Necesitas:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 memorias USB <small>(de al menos 8 GB)</small>&nbsp; [[!toggle id=\"why_two"
-"\" text=\"¿Por qué 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
-"id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
-"inline.es\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -73,7 +61,9 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 hora para instalar"
#. type: Content of: <div><div>
@@ -100,6 +90,17 @@ msgstr "[[Grabar Tails en un DVD|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Ejecutar Tails en una máquina virtual|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 memorias USB <small>(de al menos 8 GB)</small>&nbsp; [[!toggle id="
+#~ "\"why_two\" text=\"¿Por qué 2?\"]] [[!toggleable id=\"why_two\" text="
+#~ "\"\"\" [[!toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/"
+#~ "inc/router/why_two.inline.es\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#~ msgid "[[Back|install/os]]"
#~ msgstr "[[Volver|install/os]]"
diff --git a/wiki/src/install/win.fa.po b/wiki/src/install/win.fa.po
index 4450509..d8d71c4 100644
--- a/wiki/src/install/win.fa.po
+++ b/wiki/src/install/win.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+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"
@@ -47,20 +47,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/win.fr.po b/wiki/src/install/win.fr.po
index 5ce75ba..595b1b4 100644
--- a/wiki/src/install/win.fr.po
+++ b/wiki/src/install/win.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-05-16 09:25+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -52,18 +52,6 @@ msgstr "Vous avez besoin de :"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
-"id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
-"inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -72,7 +60,9 @@ msgstr ""
"small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 heure pour l'installation"
#. type: Content of: <div><div>
@@ -98,3 +88,14 @@ msgstr "[[Graver Tails sur un DVD|dvd-download]]"
#. type: Content of: <div><div><ul><li>
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Utiliser Tails dans une machine virtuelle|vm-download]]"
+
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 clés USB <small>(d'au moins 8 Go)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Pourquoi 2 ?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!"
+#~ "toggle id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/"
+#~ "why_two.inline.fr\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
diff --git a/wiki/src/install/win.html b/wiki/src/install/win.html
index a9e0cbe..c11903f 100644
--- a/wiki/src/install/win.html
+++ b/wiki/src/install/win.html
@@ -24,15 +24,8 @@
<h4>You need:</h4>
<ul>
- <li>2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id="why_two" text="Why 2?"]]
-
- [[!toggleable id="why_two" text="""
- [[!toggle id="why_two" text="X"]]
- [[!inline pages="install/inc/router/why_two.inline" raw="yes" sort="age"]]
- """]]
- </li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
- <li>1 hour to install</li>
+ <li>½ hour to install</li>
</ul>
[[
diff --git a/wiki/src/install/win.it.po b/wiki/src/install/win.it.po
index ae4aa55..1bd4587 100644
--- a/wiki/src/install/win.it.po
+++ b/wiki/src/install/win.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2017-02-09 21:12+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -60,18 +60,6 @@ msgstr "Hai bisogno di:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 chiavi USB <small>(almeno 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" text="
-"\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -79,7 +67,9 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+#, fuzzy
+#| msgid "1 hour to install"
+msgid "½ hour to install"
msgstr "1 ora per installare"
#. type: Content of: <div><div>
@@ -106,6 +96,17 @@ msgstr "[[Masterizzare Tails su un DVD|dvd-download]]"
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr "[[Usare Tails su una macchina virtuale|vm-download]]"
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 chiavi USB <small>(almeno 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Perché 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle "
+#~ "id=\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline.it\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+
#~ msgid "<strong>Windows</strong>"
#~ msgstr "<strong>Windows</strong>"
diff --git a/wiki/src/install/win.pt.po b/wiki/src/install/win.pt.po
index 9b202d7..117ab89 100644
--- a/wiki/src/install/win.pt.po
+++ b/wiki/src/install/win.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-08-20 17:33+0000\n"
"PO-Revision-Date: 2018-04-27 10:33+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
@@ -65,18 +65,6 @@ msgstr "Você precisa de:"
#. type: Content of: <div><div><ul><li>
msgid ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline"
-"\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-msgstr ""
-"2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
-"text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
-"\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two.inline."
-"pt\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
-
-#. type: Content of: <div><div><ul><li>
-msgid ""
"1 hour to download Tails (<small class=\"remove-extra-space\">[[!inline "
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
msgstr ""
@@ -84,7 +72,7 @@ msgstr ""
"pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</small>)"
#. type: Content of: <div><div><ul><li>
-msgid "1 hour to install"
+msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
@@ -110,3 +98,14 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "[[Run Tails in a virtual machine|vm-download]]"
msgstr ""
+
+#~ msgid ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"
+#~ msgstr ""
+#~ "2 USB sticks <small>(at least 8 GB)</small>&nbsp;[[!toggle id=\"why_two\" "
+#~ "text=\"Why 2?\"]] [[!toggleable id=\"why_two\" text=\"\"\" [[!toggle id="
+#~ "\"why_two\" text=\"X\"]] [[!inline pages=\"install/inc/router/why_two."
+#~ "inline.pt\" raw=\"yes\" sort=\"age\"]] \"\"\"]]"