Commit a4900e99 authored by tchou's avatar tchou
Browse files

Merge branch 'master' into web/10433-make-clear-pgp

parents 9e101468 86e18b66
......@@ -16,7 +16,7 @@ The extension will be used as well by people doing full upgrades until
we automate the download and verification steps of a full upgrade in
Tails Upgrader. See the blueprint on [[upgrades|upgrade]].
[[!toc]]
[[!toc levels=2]]
Vision
======
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2014-08-28 17:08+0300\n"
"POT-Creation-Date: 2015-11-12 12:22+0100\n"
"PO-Revision-Date: 2015-11-04 21:10+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -354,9 +354,6 @@ msgstr ""
msgid "After doing the copy, close the file browser."
msgstr "Schließen Sie nach dem Durchführen der Kopie den Dateimanager."
msgid "After doing the copy, close the file browser and the terminal."
msgstr "Schließen Sie den Dateimanager und das Terminal nach dem Kopieren."
#. type: Bullet: '1. '
msgid ""
"In the terminal, execute the following command to fix the ownership of your "
......@@ -380,3 +377,6 @@ msgstr ""
#, no-wrap
msgid " find /live/persistence/TailsData_unlocked/ -uid 1000 -exec chown -R 1000:1000 '{}' \\;\n"
msgstr " find /live/persistence/TailsData_unlocked/ -uid 1000 -exec chown -R 1000:1000 '{}' \\;\n"
#~ msgid "After doing the copy, close the file browser and the terminal."
#~ msgstr "Schließen Sie den Dateimanager und das Terminal nach dem Kopieren."
......@@ -96,10 +96,6 @@
<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" class="iso-url-text">(<span class="iso-size-MiB">$SIZE</span>)</small>
</span>
<div id="download-button-state" class="pull-right">
<span id="download-button-state-retry" class="label label-warning">Retry</span>
<span id="download-button-state-resume" class="label label-info">Resume</span>
</div>
</a>
<div id="download-text" class="btn btn-lg clearfix">
<div id="download-text-left" class="pull-left clearfix">
......@@ -115,17 +111,23 @@
</div>
</div>
<small id="download-path">Downloading to <span class="download-path">$PATH</span></small>
</div>
<div id="download-button-state" class="pull-right">
<a id="download-button-state-retry" href="#" class="btn btn-primary iso-url">Retry</a>
<span id="download-button-state-pause" class="btn btn-primary">Pause</span>
<span id="download-button-state-resume" class="btn btn-primary">Resume</span>
<span id="download-button-state-cancel" class="btn btn-primary label-warning">Cancel</span>
</div>
<div id="download-text-state" class="pull-right">
<span id='download-text-pause'>
Pause</span>
Paused</span>
<span id ="download-text-done" class="label label-success state">Done</span>
<span id ="download-text-failed" class="label label-warning state">Failed</span>
</div>
</div>
<div id="download-message">
<div id="download-message-paused">
<p>The download as been paused. Click "resume" to go on.</p>
<p>The download has been paused. Click "resume" to go on.</p>
</div>
<div id="download-message-failed">
<p>The download of the ISO image failed! Please check your network connection and try to resume...</p>
......
# 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-11-12 14:05+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: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Welcome to the Tails Installation Assistant\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/router-install\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1>Welcome to the <br>\n"
" <strong>Tails Installation Assistant</strong>\n"
"</h1>\n"
"<h4>Thank you for your interest in Tails.</h4>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>Installing Tails can be quite long but we hope you will still have good time :)</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>We will first ask you a few questions to choose your installation scenario and then guide you step by step.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"[[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Let's start the journey!</h3>\n"
" </div>\n"
" </div>\n"
"|install/os]]\n"
msgstr ""
# 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-11-12 14:05+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: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Welcome to the Tails Installation Assistant\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/router-install\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1>Welcome to the <br>\n"
" <strong>Tails Installation Assistant</strong>\n"
"</h1>\n"
"<h4>Thank you for your interest in Tails.</h4>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>Installing Tails can be quite long but we hope you will still have good time :)</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>We will first ask you a few questions to choose your installation scenario and then guide you step by step.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"[[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Let's start the journey!</h3>\n"
" </div>\n"
" </div>\n"
"|install/os]]\n"
msgstr ""
[[!meta robots="noindex"]]
[[!meta title="Welcome to the Tails Installation Assistant"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/router-install" rel="stylesheet" title=""]]
[[!meta title="Welcome to the Tails Installation Assistant"]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
<h1>Welcome to the <br>
<strong>Tails Installation Assistant</strong>
</h1>
......
# 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-11-12 14:05+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: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Welcome to the Tails Installation Assistant\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/router-install\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1>Welcome to the <br>\n"
" <strong>Tails Installation Assistant</strong>\n"
"</h1>\n"
"<h4>Thank you for your interest in Tails.</h4>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>Installing Tails can be quite long but we hope you will still have good time :)</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<p>We will first ask you a few questions to choose your installation scenario and then guide you step by step.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"[[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Let's start the journey!</h3>\n"
" </div>\n"
" </div>\n"
"|install/os]]\n"
msgstr ""
# 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-11-12 14:05+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: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Debian (& Ubuntu, Linux Mint, etc.)\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[<span class=\"back\">Back</span>|install/os]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<h1 class=\"text-center\"><strong>Debian & Ubuntu</strong> <small>(Linux Mint, etc.)</small></h1>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<div class=\"row\">\n"
" <div class=\"col-md-6\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"install/inc/router/clone\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Install from another Tails</h3>\n"
" </div>\n"
" </div>\n"
" |install/debian/clone]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" </div>\n"
" <div class=\"col-md-6\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <h3>Download and install</h3>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <h4>You need:</h4>\n"
msgstr ""
#. type: Plain text
#, no-wrap
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\" raw=\"yes\"]]</small></li>\n"
" <li>25 minutes to install</li>\n"
" </ul>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Install from Debian</h3>\n"
" </div>\n"
" </div>\n"
" |debian/usb]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\"><small>Install from Debian </small><br>using the command line</h3>\n"
" </div>\n"
" </div>\n"
" |expert/usb]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" </div>\n"
"</div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<div class=\"row also\">\n"
" <div class=\"col-sm-4 col-sm-offset-8\">\n"
" <small>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" You can also:\n"
" <ul>\n"
" <li>[[Burn Tails on a DVD|debian/dvd]]</li>\n"
" <li>[[Burn Tails on a DVD using the command line|expert/dvd]]</li>\n"
" <li>[[Run Tails in a virtual machine|debian/vm]]</li>\n"
" </ul>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" </small>\n"
" </div>\n"
"</div>\n"
msgstr ""
# 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-11-12 14:05+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: Plain text
#, no-wrap
msgid "[[!meta robots=\"noindex\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Debian (& Ubuntu, Linux Mint, etc.)\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"inc/stylesheets/router-debian\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[<span class=\"back\">Back</span>|install/os]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<h1 class=\"text-center\"><strong>Debian & Ubuntu</strong> <small>(Linux Mint, etc.)</small></h1>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<div class=\"row\">\n"
" <div class=\"col-md-6\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"install/inc/router/clone\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Install from another Tails</h3>\n"
" </div>\n"
" </div>\n"
" |install/debian/clone]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" </div>\n"
" <div class=\"col-md-6\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <h3>Download and install</h3>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <h4>You need:</h4>\n"
msgstr ""
#. type: Plain text
#, no-wrap
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\" raw=\"yes\"]]</small></li>\n"
" <li>25 minutes to install</li>\n"
" </ul>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\">Install from Debian</h3>\n"
" </div>\n"
" </div>\n"
" |debian/usb]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[\n"
" <div class=\"panel panel-primary\">\n"
" <div class=\"panel-heading\">\n"
" <h3 class=\"panel-title\"><small>Install from Debian </small><br>using the command line</h3>\n"
" </div>\n"
" </div>\n"
" |expert/usb]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" </div>\n"
"</div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<div class=\"row also\">\n"
" <div class=\"col-sm-4 col-sm-offset-8\">\n"
" <small>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" You can also:\n"
" <ul>\n"
" <li>[[Burn Tails on a DVD|debian/dvd]]</li>\n"
" <li>[[Burn Tails on a DVD using the command line|expert/dvd]]</li>\n"
" <li>[[Run Tails in a virtual machine|debian/vm]]</li>\n"
" </ul>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""