Commit 919f2fa7 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/master'

parents 5395085c 4c45b76e
......@@ -255,7 +255,7 @@ ___
./doc/about/warning --DONE, Pushed
./doc/first_steps/accessibility
./doc/first_steps/bug_reporting
./doc/first_steps/bug_reporting/tails_does_not_start
./doc/first_steps/bug_reporting/tails_does_not_start
./doc/first_steps/reset
./doc/first_steps/upgrade
......@@ -263,7 +263,7 @@ ___
./doc/first_steps/start_tails FAtta, e sul repo
./doc/first_steps/startup_options
./doc/first_steps/startup_options --DONE, Pushed
#Viz
......
......@@ -99,7 +99,7 @@ Download and verify
<a id="i_have_iso" href="" title="Select an ISO image to verify">I already have an ISO image.</a>
<div id="download">
<a id="download-button" href='[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]' class="btn btn-lg btn-primary clearfix iso-url">
<a id="download-button" href='https://un.poivron.org/~sajolida/tails-ux-testing.iso' class="btn btn-lg btn-primary clearfix iso-url">
<span id="download-button-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-button-size">(<span class="iso-size-MiB">$SIZE</span> MiB)</small>
</span>
......@@ -168,17 +168,17 @@ Download and verify
<div class="trophy">
<p>You downloaded and verified the ISO image successfully!</p>
<p>You can now continue with the next step and
<span class="install-clone">[[Open these instructions on another device|#next]].</span>
<span class="debian-usb">[[Install <span class="application">Tails Installer|#next]].</span>
<span class="windows-usb">[[Install a temporary Tails|#next]].</span>
<span class="linux-usb">[[Install a temporary Tails|#next]].</span>
<span class="mac-dvd">[[Burn a Tails DVD|#next]].</span>
<span class="mac-usb">[[Install a temporary Tails|#next]].</span>
<span class="mac-clone">[[Open these instructions on another device|#next]].</span>
<span class="upgrade-clone">[[Open these instructions on another device|#next]].</span>
<span class="upgrade-tails">[[Install a temporary Tails|#next]].</span>
<span class="install-clone">[[Open these instructions on another device|install/clone#next]].</span>
<span class="debian-usb">[[Install <span class="application">Tails Installer|install/debian/usb#next]].</span>
<span class="windows-usb">[[Install a temporary Tails|install/win/usb#next]].</span>
<span class="linux-usb">[[Install a temporary Tails|install/linux/usb#next]].</span>
<span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
<span class="mac-usb">[[Install a temporary Tails|install/mac/usb#next]].</span>
<span class="mac-clone">[[Open these instructions on another device|install/mac/clone#next]].</span>
<span class="upgrade-clone">[[Open these instructions on another device|upgrade/clone#next]].</span>
<span class="upgrade-tails">[[Install a temporary Tails|upgrade/tails#next]].</span>
</p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature.</a>. <a class="openpgp-learn" href="">Learn how to do that.</a></p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig'>OpenPGP signature.</a>. <a class="openpgp-learn" href="">Learn how to do that.</a></p>
</div>
<a href="" class="btn btn-lg btn-link">Download again</a>
</div>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 23:06+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -90,7 +90,7 @@ msgstr ""
msgid ""
" <ul>\n"
" <li>1 USB stick <small>(at least 4 GB)</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>([[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]])</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>\n"
" <li>25 minutes to install</li>\n"
" </ul>\n"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 23:06+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -90,7 +90,7 @@ msgstr ""
msgid ""
" <ul>\n"
" <li>1 USB stick <small>(at least 4 GB)</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>([[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]])</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>\n"
" <li>25 minutes to install</li>\n"
" </ul>\n"
msgstr ""
......
......@@ -24,7 +24,7 @@
<ul>
<li>1 USB stick <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>([[!inline pages="inc/stable_i386_iso_size_mib" raw="yes"]])</small></li>
<li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>
<li>25 minutes to install</li>
</ul>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 23:06+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -90,7 +90,7 @@ msgstr ""
msgid ""
" <ul>\n"
" <li>1 USB stick <small>(at least 4 GB)</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>([[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]])</small></li>\n"
" <li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>\n"
" <li>25 minutes to install</li>\n"
" </ul>\n"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 22:38+0100\n"
"POT-Creation-Date: 2015-11-19 23:45+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"
......@@ -20,12 +20,11 @@ msgstr ""
msgid ""
"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from another Tails\"]] "
"[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline "
"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
"[[<span class=\"back\">Back</span>|install/debian]]"
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 22:38+0100\n"
"POT-Creation-Date: 2015-11-19 23:45+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"
......@@ -20,12 +20,11 @@ msgstr ""
msgid ""
"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from another Tails\"]] "
"[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline "
"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
"[[<span class=\"back\">Back</span>|install/debian]]"
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/clone" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 22:38+0100\n"
"POT-Creation-Date: 2015-11-19 23:45+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"
......@@ -20,12 +20,11 @@ msgstr ""
msgid ""
"[[!meta robots=\"noindex\"]] [[!meta title=\"Install from another Tails\"]] "
"[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]] [[!meta "
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline "
"pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]] "
"[[<span class=\"back\">Back</span>|install/debian]]"
"stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]] [[!"
"meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" title=\"\"]] "
"[[!meta stylesheet=\"inc/stylesheets/install-clone\" rel=\"stylesheet\" "
"title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 11:55+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -228,7 +228,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_i386_iso_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget --continue https://un.poivron.org/~sajolida/tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -237,7 +237,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_i386_iso_sig_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">gpg --keyid-format 0xlong --verify tails-ux-testing.iso.sig tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Plain text
......@@ -256,7 +256,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_signature_output\" raw=\"yes\"]]</p>\n"
msgid ""
" <pre>\n"
"gpg: Signature made Thu 19 Nov 2015 02:39:11 PM UTC\n"
"gpg: using RSA key 0x3C83DCB52F699C56\n"
"gpg: Good signature from \"Tails developers (offline long-term identity key) <tails@boum.org>\" [full]\n"
"gpg: aka \"Tails developers <tails@boum.org>\" [full]\n"
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56\n"
" </pre>\n"
msgstr ""
#. type: Plain text
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 11:55+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -228,7 +228,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_i386_iso_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget --continue https://un.poivron.org/~sajolida/tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -237,7 +237,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_i386_iso_sig_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">gpg --keyid-format 0xlong --verify tails-ux-testing.iso.sig tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Plain text
......@@ -256,7 +256,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_signature_output\" raw=\"yes\"]]</p>\n"
msgid ""
" <pre>\n"
"gpg: Signature made Thu 19 Nov 2015 02:39:11 PM UTC\n"
"gpg: using RSA key 0x3C83DCB52F699C56\n"
"gpg: Good signature from \"Tails developers (offline long-term identity key) <tails@boum.org>\" [full]\n"
"gpg: aka \"Tails developers <tails@boum.org>\" [full]\n"
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56\n"
" </pre>\n"
msgstr ""
#. type: Plain text
......
......@@ -93,19 +93,26 @@ using the Tails signing key.
1. Download the ISO image:
<p class="pre">wget --continue [[!inline pages="inc/stable_i386_iso_url" raw="yes"]]</p>
<p class="pre">wget --continue https://un.poivron.org/~sajolida/tails-ux-testing.iso</p>
1. Download the signature of the ISO image:
<p class="pre">wget [[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]</p>
<p class="pre">wget https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig</p>
1. Verify that the ISO image is signed by the Tails signing key:
<p class="pre">[[!inline pages="inc/stable_i386_gpg_verify" raw="yes"]]</p>
<p class="pre">gpg --keyid-format 0xlong --verify tails-ux-testing.iso.sig tails-ux-testing.iso</p>
The output of this command should be the following:
<p class="pre">[[!inline pages="inc/stable_i386_gpg_signature_output" raw="yes"]]</p>
<pre>
gpg: Signature made Thu 19 Nov 2015 02:39:11 PM UTC
gpg: using RSA key 0x3C83DCB52F699C56
gpg: Good signature from "Tails developers (offline long-term identity key) <tails@boum.org>" [full]
gpg: aka "Tails developers <tails@boum.org>" [full]
Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F
Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56
</pre>
Verify in this output that:
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 11:55+0100\n"
"POT-Creation-Date: 2015-11-20 07:59+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"
......@@ -228,7 +228,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget --continue [[!inline pages=\"inc/stable_i386_iso_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget --continue https://un.poivron.org/~sajolida/tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -237,7 +237,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">wget [[!inline pages=\"inc/stable_i386_iso_sig_url\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">wget https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig</p>\n"
msgstr ""
#. type: Bullet: '1. '
......@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]</p>\n"
msgid " <p class=\"pre\">gpg --keyid-format 0xlong --verify tails-ux-testing.iso.sig tails-ux-testing.iso</p>\n"
msgstr ""
#. type: Plain text
......@@ -256,7 +256,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p class=\"pre\">[[!inline pages=\"inc/stable_i386_gpg_signature_output\" raw=\"yes\"]]</p>\n"
msgid ""
" <pre>\n"
"gpg: Signature made Thu 19 Nov 2015 02:39:11 PM UTC\n"
"gpg: using RSA key 0x3C83DCB52F699C56\n"
"gpg: Good signature from \"Tails developers (offline long-term identity key) <tails@boum.org>\" [full]\n"
"gpg: aka \"Tails developers <tails@boum.org>\" [full]\n"
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56\n"
" </pre>\n"
msgstr ""
#. type: Plain text
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 22:43+0100\n"
"POT-Creation-Date: 2015-11-19 23:45+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"
......@@ -27,22 +27,23 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"<span class=\"windows-usb linux-usb mac-usb mac-dvd\">1 or 2 hours</span> "
"<span class=\"debian expert\">1 hour</span> <span class=\"clone\">15 "
"minutes</span>"
"<span class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows-usb linux-usb mac-usb mac-dvd debian expert\"> <small>"
"[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]] to download</"
"small>"
"<span class=\"windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-"
"tails\"> <small>[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes"
"\"]] to download</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows-usb linux-usb mac-usb mac-dvd\"><small>45 "
"minutes to install</small></span> <span class=\"debian expert\"><small>25 "
"minutes to install</small></span>"
"minutes to install</small></span> <span class=\"upgrade-tails\"><small>20 "
"minutes to upgrade</small></span>"
msgstr ""
#. type: Content of: <div><div><div><div>
......@@ -65,6 +66,10 @@ msgstr ""
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "Your Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
......@@ -110,8 +115,9 @@ msgid ""
"First you will <span class=\"windows-usb linux-usb mac-usb\">install a "
"temporary Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn "
"a temporary Tails on a DVD.</span> <span class=\"debian expert\">install a "
"Tails on your USB stick.</span> <span class=\"clone\">restart on the other "
"Tails.</span>"
"Tails on your USB stick.</span> <span class=\"install-clone upgrade-clone"
"\">restart on the other Tails.</span> <span class=\"upgrade-tails\">install "
"and upgrade a temporary Tails.</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
......@@ -139,10 +145,22 @@ msgstr ""
msgid "Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Upgrade"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/icons/restart.png link=\"no\"]]"
msgstr ""
......@@ -155,9 +173,10 @@ msgstr ""
msgid ""
"Then you will <span class=\"windows-usb linux-usb 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=\"clone\">install "
"Tails on your USB stick.</span> <span class=\"debian expert\">configure it.</"
"span>"
"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>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
......@@ -165,13 +184,19 @@ msgid "[[!img install/inc/infography/clone-temporary-tails.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Install"
msgid ""
"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
"\">Upgrade</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-19 22:43+0100\n"
"POT-Creation-Date: 2015-11-19 23:45+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"
......@@ -27,22 +27,23 @@ msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"<span class=\"windows-usb linux-usb mac-usb mac-dvd\">1 or 2 hours</span> "
"<span class=\"debian expert\">1 hour</span> <span class=\"clone\">15 "
"minutes</span>"
"<span class=\"debian expert\">1 hour</span> <span class=\"install-clone\">15 "
"minutes</span> <span class=\"upgrade-clone\">10 minutes</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4><span>
msgid ""
"<span class=\"windows-usb linux-usb mac-usb mac-dvd debian expert\"> <small>"
"[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes\"]] to download</"
"small>"
"<span class=\"windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-"
"tails\"> <small>[[!inline pages=\"inc/stable_i386_iso_size_mib\" raw=\"yes"
"\"]] to download</small>"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid ""
"</span> <span class=\"windows-usb linux-usb mac-usb mac-dvd\"><small>45 "
"minutes to install</small></span> <span class=\"debian expert\"><small>25 "
"minutes to install</small></span>"
"minutes to install</small></span> <span class=\"upgrade-tails\"><small>20 "
"minutes to upgrade</small></span>"
msgstr ""
#. type: Content of: <div><div><div><div>
......@@ -65,6 +66,10 @@ msgstr ""
msgid "[[!img install/inc/icons/1-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "Your Tails"
msgstr ""
#. type: Content of: <div><div><div><div><div><h4>
msgid "1 USB stick"
msgstr ""
......@@ -110,8 +115,9 @@ msgid ""
"First you will <span class=\"windows-usb linux-usb mac-usb\">install a "
"temporary Tails on the first USB stick.</span> <span class=\"mac-dvd\">burn "
"a temporary Tails on a DVD.</span> <span class=\"debian expert\">install a "
"Tails on your USB stick.</span> <span class=\"clone\">restart on the other "
"Tails.</span>"
"Tails on your USB stick.</span> <span class=\"install-clone upgrade-clone"
"\">restart on the other Tails.</span> <span class=\"upgrade-tails\">install "
"and upgrade a temporary Tails.</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
......@@ -139,10 +145,22 @@ msgstr ""
msgid "Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/install-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/insert-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Upgrade"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/icons/restart.png link=\"no\"]]"
msgstr ""
......@@ -155,9 +173,10 @@ msgstr ""
msgid ""
"Then you will <span class=\"windows-usb linux-usb 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=\"clone\">install "
"Tails on your USB stick.</span> <span class=\"debian expert\">configure it.</"
"span>"
"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>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
......@@ -165,13 +184,19 @@ msgid "[[!img install/inc/infography/clone-temporary-tails.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Install"
msgid ""
"<span class=\"install-clone\">Install</span> <span class=\"upgrade"
"\">Upgrade</span>"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/clone-dvd.png link=\"no\"]]"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "<span class=\"step-number\"></span>Install"
msgstr ""
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/infography/create-persistence.png link=\"no\"]]"
msgstr ""
......
......@@ -9,16 +9,17 @@
<span class="windows-usb linux-usb mac-usb mac-dvd">1 or 2 hours</span>
<span class="debian expert">1 hour</span>
<span class="clone">15 minutes</span>
<span class="install-clone">15 minutes</span>
<span class="upgrade-clone">10 minutes</span>
<br />