summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-01-10 15:30:39 +0000
committerTails developers <amnesia@boum.org>2014-01-10 15:30:39 +0000
commit04bd4a431a61a077625304ef9a40a4ae6360b45e (patch)
treeb0979588844dcd91efce07aedcf9dd4f7ef6a9f6 /wiki/src/doc
parentae29aebb40781369c04c568224af0f9bcdb132bb (diff)
Refresh PO files.
Diffstat (limited to 'wiki/src/doc')
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po19
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po25
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po25
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po234
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po277
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po254
-rw-r--r--wiki/src/doc/upgrade/error/check.de.po40
-rw-r--r--wiki/src/doc/upgrade/error/check.fr.po40
-rw-r--r--wiki/src/doc/upgrade/error/check.pt.po40
-rw-r--r--wiki/src/doc/upgrade/error/download.de.po37
-rw-r--r--wiki/src/doc/upgrade/error/download.fr.po37
-rw-r--r--wiki/src/doc/upgrade/error/download.pt.po37
-rw-r--r--wiki/src/doc/upgrade/error/install.de.po61
-rw-r--r--wiki/src/doc/upgrade/error/install.fr.po61
-rw-r--r--wiki/src/doc/upgrade/error/install.pt.po61
15 files changed, 966 insertions, 282 deletions
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index f60696c..815e98a 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-22 21:40+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -167,6 +167,18 @@ msgid ""
"</div>\n"
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "[[!img gtk-about.png link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"text\"><strong>About Tails</strong>: Tails version and other information</div>\n"
+"</div>\n"
+msgstr ""
+
#. type: Title -
#, no-wrap
msgid "Applications Shortcuts\n"
@@ -237,6 +249,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<a id=\"terminal\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!img gnome-terminal.png link=no]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index b790d00..923c8af 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-07 17:16+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+0100\n"
"PO-Revision-Date: 2014-01-03 12:21-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -194,6 +194,24 @@ msgstr ""
"paquets logiciels</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img tor-on.png link=no]]\n"
+msgid "[[!img gtk-about.png link=no]]\n"
+msgstr "[[!img tor-on.png link=no]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Claws Mail</strong>: email client</div>\n"
+#| "</div>\n"
+msgid ""
+"<div class=\"text\"><strong>About Tails</strong>: Tails version and other information</div>\n"
+"</div>\n"
+msgstr ""
+"<div class=\"text\"><strong>Claws Mail</strong> : client email</div>\n"
+"</div>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications Shortcuts\n"
@@ -283,6 +301,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<a id=\"terminal\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!img gnome-terminal.png link=no]]\n"
msgstr "[[!img gnome-terminal.png link=no]]\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
index bb237f0..291ef78 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-22 21:40+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+0100\n"
"PO-Revision-Date: 2013-12-09 00:56+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -203,6 +203,24 @@ msgstr ""
"remova e atualize pacotes de software</div>\n"
"</div>\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img tor-on.png link=no]]\n"
+msgid "[[!img gtk-about.png link=no]]\n"
+msgstr "[[!img tor-on.png link=no]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"text\"><strong>Claws Mail</strong>: email client</div>\n"
+#| "</div>\n"
+msgid ""
+"<div class=\"text\"><strong>About Tails</strong>: Tails version and other information</div>\n"
+"</div>\n"
+msgstr ""
+"<div class=\"text\"><strong>Claws Mail</strong>: cliente de email</div>\n"
+"</div>\n"
+
#. type: Title -
#, no-wrap
msgid "Applications Shortcuts\n"
@@ -298,6 +316,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<a id=\"terminal\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!img gnome-terminal.png link=no]]\n"
msgstr "[[!img gnome-terminal.png link=no]]\n"
diff --git a/wiki/src/doc/first_steps/upgrade.de.po b/wiki/src/doc/first_steps/upgrade.de.po
index 8f14a6e..c67bd90 100644
--- a/wiki/src/doc/first_steps/upgrade.de.po
+++ b/wiki/src/doc/first_steps/upgrade.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-22 19:55+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,41 +18,240 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB stick or SD card\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Tails includes an automatic mechanism to upgrade a USB stick or a SD card to "
+"newer versions. When it is not possible to do this **automatic upgrade**, it "
+"is possible to do a **manual upgrade**. This page describes both techniques."
msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
-"<span class=\"application\">Tails Installer</span> also allows you to upgrade\n"
-"a USB stick or SD card to a newer version of Tails.\n"
+"Our upgrades always fix important security issues so it is important to do "
+"them as soon as possible."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"The following techniques only work if the device, USB stick or SD card, was installed using\n"
-"<span class=\"application\">Tails Installer</span>. **The persistent storage\n"
-"on the device will be preserved.** There are two methods to do the upgrade:\n"
+"Both techniques only work if the upgraded device, USB stick or SD card, was\n"
+"installed using <span class=\"application\">Tails Installer</span>. **The\n"
+"persistent storage on the device will be preserved.**\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you use Tails from a DVD or if your Tails device was not installed using\n"
+"<span class=\"application\">Tails Installer</span>, it is not possible to upgrade\n"
+"and you need to follow our [[installation instructions|download#media]] again\n"
+"with the new ISO image.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a name=\"automatic\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Automatic upgrade using <span class=\"application\">Tails Upgrader</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
+"Upgrader</span> automatically checks if upgrades are available and then\n"
+"proposes you to upgrade your device.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "The advantages of this technique are the following:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"You only need a single Tails device. The upgrade is done on the fly from a "
+"running Tails. After upgrading, you can restart and use the new version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The upgrade is much smaller to download than a full ISO image."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The upgrade mechanism includes cryptographic verification of the upgrade. "
+"You don't have to verify the ISO image yourself anymore."
+msgstr ""
+
+#. type: Plain text
+msgid "Requirements:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"A Tails device, USB stick or SD card, installed using <span class="
+"\"application\">Tails Installer</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "An Internet connection."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After connecting to Tor, if an upgrade is available, a dialog box appears "
+"and proposes you to upgrade your device."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img upgrader.png link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+"<li>It is recommended to close all the open applications during the\n"
+"upgrade.</li>\n"
+"<li>Downloading the upgrade might take a long time, from several minutes to a\n"
+"few hours.</li>\n"
+"<li>The networking will be disabled after downloading the upgrade.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you decide to do the upgrade, click on <span class=\"guilabel\">Upgrade</span>,\n"
+"and follow the assistant through the upgrade process.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If an error occurs, the assistant proposes you to read one of the following "
+"pages:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while checking for available upgrades:<br/> [[file:///usr/"
+"share/doc/tails/website/doc/upgrade/error/check.en.html|upgrade/error/check]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while download the upgrade:<br/> [[file:///usr/share/doc/"
+"tails/website/doc/upgrade/error/download.en.html|upgrade/error/download]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while installing the upgrade:<br/> [[file:///usr/share/"
+"doc/tails/website/doc/upgrade/error/install.en.html|upgrade/error/install]]"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a name=\"manual\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"It might not always be possible to do an automatic upgrade as described "
+"above. For example, when:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "No automatic upgrade is available from our website for this version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The automatic upgrade is impossible for technical reasons (not enough "
+"memory, not enough free space on the device, etc.)."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"You want to upgrade from another Tails device which already has a newer "
+"version installed, for example when working offline."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The automatic upgrade failed and you need to repair a Tails device."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"In that case, <span class=\"application\">Tails Installer</span> allows you to\n"
+"manually upgrade a USB stick or SD card to a newer version of Tails. Using <span\n"
+"class=\"application\">Tails Installer</span> you can either:\n"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
-"a newer version of Tails"
+"a newer version of Tails."
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails"
+"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"As for the installation, you need to start\n"
-"<span class=\"application\">Tails Installer</span> from another media than the\n"
-"device that you want to upgrade.\n"
+"Like for installing, you need to start <span class=\"application\">Tails\n"
+"Installer</span> from another media than the device that you want to upgrade.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To know the version of a running Tails, choose\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">System</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">About Tails</span>\n"
+"</span>\n"
msgstr ""
#. type: Plain text
@@ -60,15 +259,14 @@ msgstr ""
msgid "<a id=\"clone\"></a>\n"
msgstr ""
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Clone & Upgrade\n"
msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from the device, USB stick or SD card, that you want to clone "
-"from."
+"Start Tails from the DVD, USB stick, or SD card, that you want to clone from."
msgstr ""
#. type: Plain text
@@ -121,14 +319,14 @@ msgstr ""
msgid "<a id=\"from_iso\"></a>\n"
msgstr ""
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Upgrade from ISO\n"
msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from another media than the device, USB stick or SD card, that "
+"Start Tails from another DVD, USB stick, or SD card, than the device that "
"you want to upgrade."
msgstr ""
@@ -158,7 +356,7 @@ msgstr ""
#, no-wrap
msgid ""
" If the ISO image is stored in a persistent volume, the corresponding device\n"
-" appears first as <span class=\"emphasis\">Encrypted</span>. Click on the device\n"
+" appears first as <span class=\"guilabel\">Encrypted</span>. Click on the device\n"
" and, in the popup window, enter the passphrase to unlock it.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index 7d96e21..45faaab 100644
--- a/wiki/src/doc/first_steps/upgrade.fr.po
+++ b/wiki/src/doc/first_steps/upgrade.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-01-07 17:16+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+0100\n"
"PO-Revision-Date: 2014-01-03 12:24-0000\n"
"Last-Translator: saegor <saegor@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,51 +17,256 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Mettre à jour une Clé USB ou carte SD Tails\"]]\n"
#. type: Plain text
+msgid ""
+"Tails includes an automatic mechanism to upgrade a USB stick or a SD card to "
+"newer versions. When it is not possible to do this **automatic upgrade**, it "
+"is possible to do a **manual upgrade**. This page describes both techniques."
+msgstr ""
+
+#. type: Plain text
#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
-"<span class=\"application\">Tails Installer</span> also allows you to upgrade\n"
-"a USB stick or SD card to a newer version of Tails.\n"
+"Our upgrades always fix important security issues so it is important to do "
+"them as soon as possible."
msgstr ""
-"<span class=\"application\">L'Installeur de Tails</span> vous permet\n"
-"de mettre à jour une clé USB ou une carte SD vers une version plus récente.\n"
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The following techniques only work if the device, USB stick or SD card, was installed using\n"
+#| "<span class=\"application\">Tails Installer</span>. **The persistent storage\n"
+#| "on the device will be preserved.** There are two methods to do the upgrade:\n"
msgid ""
-"The following techniques only work if the device, USB stick or SD card, was installed using\n"
-"<span class=\"application\">Tails Installer</span>. **The persistent storage\n"
-"on the device will be preserved.** There are two methods to do the upgrade:\n"
+"Both techniques only work if the upgraded device, USB stick or SD card, was\n"
+"installed using <span class=\"application\">Tails Installer</span>. **The\n"
+"persistent storage on the device will be preserved.**\n"
msgstr ""
"Les procédures qui suivent ne fonctionnent que si la clé USB a été installée via\n"
"l'<span class=\"application\">Installeur de Tails</span>. **L'espace persistant\n"
"sur la clé sera préservé.** Il y a deux méthodes pour faire la mise à jour:\n"
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you use Tails from a DVD or if your Tails device was not installed using\n"
+"<span class=\"application\">Tails Installer</span>, it is not possible to upgrade\n"
+"and you need to follow our [[installation instructions|download#media]] again\n"
+"with the new ISO image.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"from_iso\"></a>\n"
+msgid "<a name=\"automatic\"></a>\n"
+msgstr "<a id=\"from_iso\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Automatic upgrade using <span class=\"application\">Tails Upgrader</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
+"Upgrader</span> automatically checks if upgrades are available and then\n"
+"proposes you to upgrade your device.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "The advantages of this technique are the following:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"You only need a single Tails device. The upgrade is done on the fly from a "
+"running Tails. After upgrading, you can restart and use the new version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The upgrade is much smaller to download than a full ISO image."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The upgrade mechanism includes cryptographic verification of the upgrade. "
+"You don't have to verify the ISO image yourself anymore."
+msgstr ""
+
+#. type: Plain text
+msgid "Requirements:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"A Tails device, USB stick or SD card, installed using <span class="
+"\"application\">Tails Installer</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "An Internet connection."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After connecting to Tor, if an upgrade is available, a dialog box appears "
+"and proposes you to upgrade your device."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img upgrader.png link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+"<li>It is recommended to close all the open applications during the\n"
+"upgrade.</li>\n"
+"<li>Downloading the upgrade might take a long time, from several minutes to a\n"
+"few hours.</li>\n"
+"<li>The networking will be disabled after downloading the upgrade.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you decide to do the upgrade, click on <span class=\"guilabel\">Upgrade</span>,\n"
+"and follow the assistant through the upgrade process.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If an error occurs, the assistant proposes you to read one of the following "
+"pages:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while checking for available upgrades:<br/> [[file:///usr/"
+"share/doc/tails/website/doc/upgrade/error/check.en.html|upgrade/error/check]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while download the upgrade:<br/> [[file:///usr/share/doc/"
+"tails/website/doc/upgrade/error/download.en.html|upgrade/error/download]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while installing the upgrade:<br/> [[file:///usr/share/"
+"doc/tails/website/doc/upgrade/error/install.en.html|upgrade/error/install]]"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"clone\"></a>\n"
+msgid "<a name=\"manual\"></a>\n"
+msgstr "<a id=\"clone\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"It might not always be possible to do an automatic upgrade as described "
+"above. For example, when:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "No automatic upgrade is available from our website for this version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The automatic upgrade is impossible for technical reasons (not enough "
+"memory, not enough free space on the device, etc.)."
+msgstr ""
+
#. type: Bullet: ' - '
msgid ""
+"You want to upgrade from another Tails device which already has a newer "
+"version installed, for example when working offline."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The automatic upgrade failed and you need to repair a Tails device."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Tails Installer</span> also allows you to upgrade\n"
+#| "a USB stick or SD card to a newer version of Tails.\n"
+msgid ""
+"In that case, <span class=\"application\">Tails Installer</span> allows you to\n"
+"manually upgrade a USB stick or SD card to a newer version of Tails. Using <span\n"
+"class=\"application\">Tails Installer</span> you can either:\n"
+msgstr ""
+"<span class=\"application\">L'Installeur de Tails</span> vous permet\n"
+"de mettre à jour une clé USB ou une carte SD vers une version plus récente.\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Upgrade by cloning from another device|upgrade#clone]] which already "
+#| "runs a newer version of Tails"
+msgid ""
"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
-"a newer version of Tails"
+"a newer version of Tails."
msgstr ""
"[[Mettre à jour en clonant à partir d'un autre périphérique|upgrade#clone]] "
"qui fait déjà fonctionner une version plus récente de Tails."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails"
msgid ""
-"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails"
+"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails."
msgstr ""
"[[Mettre à jour en clonant une image ISO|upgrade#from_iso]] d'une version "
"plus récente de Tails."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "As for the installation, you need to start\n"
+#| "<span class=\"application\">Tails Installer</span> from another media than the\n"
+#| "device that you want to upgrade.\n"
msgid ""
-"As for the installation, you need to start\n"
-"<span class=\"application\">Tails Installer</span> from another media than the\n"
-"device that you want to upgrade.\n"
+"Like for installing, you need to start <span class=\"application\">Tails\n"
+"Installer</span> from another media than the device that you want to upgrade.\n"
msgstr ""
"Comme pour l'installation, vous avez besoin de démarrer l'\n"
"<span class=\"application\">Installeur de Tails</span> à partir d'un autre média que\n"
@@ -69,18 +274,36 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To know the version of a running Tails, choose\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">System</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">About Tails</span>\n"
+"</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"clone\"></a>\n"
msgstr "<a id=\"clone\"></a>\n"
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Clone & Upgrade\n"
msgstr "Cloner & Mettre à jour\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Start Tails from the device, USB stick or SD card, that you want to clone "
+#| "from."
msgid ""
-"Start Tails from the device, USB stick or SD card, that you want to clone "
-"from."
+"Start Tails from the DVD, USB stick, or SD card, that you want to clone from."
msgstr ""
"Démarrez Tails depuis la clé USB ou carte SD depuis laquelle vous voulez "
"cloner."
@@ -150,14 +373,18 @@ msgstr ""
msgid "<a id=\"from_iso\"></a>\n"
msgstr "<a id=\"from_iso\"></a>\n"
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Upgrade from ISO\n"
msgstr "Mettre à jour à partir d'un ISO\n"
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Start Tails from another media than the device, USB stick or SD card, "
+#| "that you want to upgrade."
msgid ""
-"Start Tails from another media than the device, USB stick or SD card, that "
+"Start Tails from another DVD, USB stick, or SD card, than the device that "
"you want to upgrade."
msgstr ""
"Démarrez Tails sur un périphérique différent de celui que vous voulez mettre "
@@ -192,10 +419,14 @@ msgid " <div class=\"tip\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " If the ISO image is stored in a persistent volume, the corresponding device\n"
+#| " appears first as <span class=\"emphasis\">Encrypted</span>. Click on the device\n"
+#| " and, in the popup window, enter the passphrase to unlock it.\n"
msgid ""
" If the ISO image is stored in a persistent volume, the corresponding device\n"
-" appears first as <span class=\"emphasis\">Encrypted</span>. Click on the device\n"
+" appears first as <span class=\"guilabel\">Encrypted</span>. Click on the device\n"
" and, in the popup window, enter the passphrase to unlock it.\n"
msgstr ""
" Si l'image ISO est stockée dans un volume persistant, le périphérique correspondant\n"
diff --git a/wiki/src/doc/first_steps/upgrade.pt.po b/wiki/src/doc/first_steps/upgrade.pt.po
index 7936c1b..a81985b 100644
--- a/wiki/src/doc/first_steps/upgrade.pt.po
+++ b/wiki/src/doc/first_steps/upgrade.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-22 19:55+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+0100\n"
"PO-Revision-Date: 2012-07-11 15:21+0100\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,20 +18,31 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
-msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Atualizando uma memória USB com Tails\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<span class=\"application\">Tails USB installer</span> also allows you to upgrade\n"
-#| "a USB stick to a newer version of Tails.\n"
msgid ""
-"<span class=\"application\">Tails Installer</span> also allows you to upgrade\n"
-"a USB stick or SD card to a newer version of Tails.\n"
+"Tails includes an automatic mechanism to upgrade a USB stick or a SD card to "
+"newer versions. When it is not possible to do this **automatic upgrade**, it "
+"is possible to do a **manual upgrade**. This page describes both techniques."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Our upgrades always fix important security issues so it is important to do "
+"them as soon as possible."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
msgstr ""
-"O <span class=\"application\">Instalador USB do Tails</span> também permite fazer a atualização\n"
-"da memória USB para uma versão mais nova do Tails.\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -40,14 +51,190 @@ msgstr ""
#| "<span class=\"application\">Tails USB installer</span>. **The persistent storage\n"
#| "on the USB stick will be preserved.** There are two methods to do the upgrade:\n"
msgid ""
-"The following techniques only work if the device, USB stick or SD card, was installed using\n"
-"<span class=\"application\">Tails Installer</span>. **The persistent storage\n"
-"on the device will be preserved.** There are two methods to do the upgrade:\n"
+"Both techniques only work if the upgraded device, USB stick or SD card, was\n"
+"installed using <span class=\"application\">Tails Installer</span>. **The\n"
+"persistent storage on the device will be preserved.**\n"
msgstr ""
"A técnica a seguir somente funciona se a memória USB foi instalada usando\n"
"o <span class=\"application\">Instalador USB do Tails</span>. **O armazenamento\n"
"persistente na memória USB será preservado.** Existem dois métodos para realizar a atualização:\n"
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you use Tails from a DVD or if your Tails device was not installed using\n"
+"<span class=\"application\">Tails Installer</span>, it is not possible to upgrade\n"
+"and you need to follow our [[installation instructions|download#media]] again\n"
+"with the new ISO image.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"from_iso\"></a>\n"
+msgid "<a name=\"automatic\"></a>\n"
+msgstr "<a id=\"from_iso\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Automatic upgrade using <span class=\"application\">Tails Upgrader</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
+"Upgrader</span> automatically checks if upgrades are available and then\n"
+"proposes you to upgrade your device.\n"
+msgstr ""
+
+#. type: Plain text
+msgid "The advantages of this technique are the following:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"You only need a single Tails device. The upgrade is done on the fly from a "
+"running Tails. After upgrading, you can restart and use the new version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The upgrade is much smaller to download than a full ISO image."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The upgrade mechanism includes cryptographic verification of the upgrade. "
+"You don't have to verify the ISO image yourself anymore."
+msgstr ""
+
+#. type: Plain text
+msgid "Requirements:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"A Tails device, USB stick or SD card, installed using <span class="
+"\"application\">Tails Installer</span>."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "An Internet connection."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"After connecting to Tor, if an upgrade is available, a dialog box appears "
+"and proposes you to upgrade your device."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img upgrader.png link=no]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul>\n"
+"<li>It is recommended to close all the open applications during the\n"
+"upgrade.</li>\n"
+"<li>Downloading the upgrade might take a long time, from several minutes to a\n"
+"few hours.</li>\n"
+"<li>The networking will be disabled after downloading the upgrade.</li>\n"
+"</ul>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you decide to do the upgrade, click on <span class=\"guilabel\">Upgrade</span>,\n"
+"and follow the assistant through the upgrade process.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If an error occurs, the assistant proposes you to read one of the following "
+"pages:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while checking for available upgrades:<br/> [[file:///usr/"
+"share/doc/tails/website/doc/upgrade/error/check.en.html|upgrade/error/check]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while download the upgrade:<br/> [[file:///usr/share/doc/"
+"tails/website/doc/upgrade/error/download.en.html|upgrade/error/download]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"If an error occurs while installing the upgrade:<br/> [[file:///usr/share/"
+"doc/tails/website/doc/upgrade/error/install.en.html|upgrade/error/install]]"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"clone\"></a>\n"
+msgid "<a name=\"manual\"></a>\n"
+msgstr "<a id=\"clone\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"It might not always be possible to do an automatic upgrade as described "
+"above. For example, when:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "No automatic upgrade is available from our website for this version."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The automatic upgrade is impossible for technical reasons (not enough "
+"memory, not enough free space on the device, etc.)."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"You want to upgrade from another Tails device which already has a newer "
+"version installed, for example when working offline."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The automatic upgrade failed and you need to repair a Tails device."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">Tails USB installer</span> also allows you to upgrade\n"
+#| "a USB stick to a newer version of Tails.\n"
+msgid ""
+"In that case, <span class=\"application\">Tails Installer</span> allows you to\n"
+"manually upgrade a USB stick or SD card to a newer version of Tails. Using <span\n"
+"class=\"application\">Tails Installer</span> you can either:\n"
+msgstr ""
+"O <span class=\"application\">Instalador USB do Tails</span> também permite fazer a atualização\n"
+"da memória USB para uma versão mais nova do Tails.\n"
+
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
@@ -55,7 +242,7 @@ msgstr ""
#| "runs a newer version of Tails"
msgid ""
"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
-"a newer version of Tails"
+"a newer version of Tails."
msgstr ""
"[[Atualizar clonando de uma outra memória USB|upgrade#clone]] que já "
"contenha uma versão nova do Tails"
@@ -65,7 +252,7 @@ msgstr ""
#| msgid ""
#| "[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails"
msgid ""
-"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails"
+"[[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of Tails."
msgstr ""
"[[Atualizar de uma imagem ISO|upgrade#from_iso]] de uma versão mais nova do "
"Tails"
@@ -77,19 +264,33 @@ msgstr ""
#| "<span class=\"application\">Tails USB installer</span> from another media than the\n"
#| "USB stick that you want to upgrade.\n"
msgid ""
-"As for the installation, you need to start\n"
-"<span class=\"application\">Tails Installer</span> from another media than the\n"
-"device that you want to upgrade.\n"
+"Like for installing, you need to start <span class=\"application\">Tails\n"
+"Installer</span> from another media than the device that you want to upgrade.\n"
msgstr ""
"Para a instalação, você precisa iniciar o\n"
"<span class=\"application\">Instalador USB do Tails</span> de uma outra midia que não seja amemória USB que você quer atualizar.\n"
#. type: Plain text
#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To know the version of a running Tails, choose\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">System</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">About Tails</span>\n"
+"</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"clone\"></a>\n"
msgstr "<a id=\"clone\"></a>\n"
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Clone & Upgrade\n"
msgstr "Clonar & Atualizar\n"
@@ -100,8 +301,7 @@ msgstr "Clonar & Atualizar\n"
#| "Start Tails, version 0.11 or later, from the USB that you want to clone "
#| "from."
msgid ""
-"Start Tails from the device, USB stick or SD card, that you want to clone "
-"from."
+"Start Tails from the DVD, USB stick, or SD card, that you want to clone from."
msgstr ""
"Inicie o Tails, versão 0.11 ou maior, a partir do dispositivo USB que você "
"quer clonar."
@@ -196,7 +396,7 @@ msgstr ""
msgid "<a id=\"from_iso\"></a>\n"
msgstr "<a id=\"from_iso\"></a>\n"
-#. type: Title =
+#. type: Title -
#, no-wrap
msgid "Upgrade from ISO\n"
msgstr "Atualize a partir de uma imagem ISO\n"
@@ -207,7 +407,7 @@ msgstr "Atualize a partir de uma imagem ISO\n"
#| "Start Tails, version 0.11 or later, from another media than the USB stick "
#| "that you want to upgrade."
msgid ""
-"Start Tails from another media than the device, USB stick or SD card, that "
+"Start Tails from another DVD, USB stick, or SD card, than the device that "
"you want to upgrade."
msgstr ""
"Inicie o Tails, versão 0.11 ou maior, a partir de uma midia que não seja a "
@@ -241,10 +441,14 @@ msgid " <div class=\"tip\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " If the ISO image is stored in a persistent volume, the corresponding device\n"
+#| " appears first as <span class=\"emphasis\">Encrypted</span>. Click on the device\n"
+#| " and, in the popup window, enter the passphrase to unlock it.\n"
msgid ""
" If the ISO image is stored in a persistent volume, the corresponding device\n"
-" appears first as <span class=\"emphasis\">Encrypted</span>. Click on the device\n"
+" appears first as <span class=\"guilabel\">Encrypted</span>. Click on the device\n"
" and, in the popup window, enter the passphrase to unlock it.\n"
msgstr ""
" Se a imagem ISO estiver armazenada em um volume persistente, o dispositivo correspondente\n"
diff --git a/wiki/src/doc/upgrade/error/check.de.po b/wiki/src/doc/upgrade/error/check.de.po
index ab79095..d8e7f7d 100644
--- a/wiki/src/doc/upgrade/error/check.de.po
+++ b/wiki/src/doc/upgrade/error/check.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,38 +18,44 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not determine whether an upgrade is available\"]]\n"
+msgid "[[!meta title=\"Error while checking for upgrades\"]]\n"
msgstr ""
#. type: Plain text
-msgid "Tails could not determine whether an upgrade is available."
+msgid ""
+"Tails could not determine whether an upgrade is available from our website."
+msgstr ""
+
+#. type: Plain text
+msgid "This is probably caused by a network connection problem."
msgstr ""
#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node being used, or the "
-"<https://tails.boum.org> web server, or anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, or our website."
+msgstr ""
+
+#. type: Plain text
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/check.fr.po b/wiki/src/doc/upgrade/error/check.fr.po
index ab79095..d8e7f7d 100644
--- a/wiki/src/doc/upgrade/error/check.fr.po
+++ b/wiki/src/doc/upgrade/error/check.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,38 +18,44 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not determine whether an upgrade is available\"]]\n"
+msgid "[[!meta title=\"Error while checking for upgrades\"]]\n"
msgstr ""
#. type: Plain text
-msgid "Tails could not determine whether an upgrade is available."
+msgid ""
+"Tails could not determine whether an upgrade is available from our website."
+msgstr ""
+
+#. type: Plain text
+msgid "This is probably caused by a network connection problem."
msgstr ""
#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node being used, or the "
-"<https://tails.boum.org> web server, or anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, or our website."
+msgstr ""
+
+#. type: Plain text
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/check.pt.po b/wiki/src/doc/upgrade/error/check.pt.po
index ab79095..d8e7f7d 100644
--- a/wiki/src/doc/upgrade/error/check.pt.po
+++ b/wiki/src/doc/upgrade/error/check.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,38 +18,44 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not determine whether an upgrade is available\"]]\n"
+msgid "[[!meta title=\"Error while checking for upgrades\"]]\n"
msgstr ""
#. type: Plain text
-msgid "Tails could not determine whether an upgrade is available."
+msgid ""
+"Tails could not determine whether an upgrade is available from our website."
+msgstr ""
+
+#. type: Plain text
+msgid "This is probably caused by a network connection problem."
msgstr ""
#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to check for upgrades again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node being used, or the "
-"<https://tails.boum.org> web server, or anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, or our website."
+msgstr ""
+
+#. type: Plain text
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/download.de.po b/wiki/src/doc/upgrade/error/download.de.po
index 725b2d4..9054638 100644
--- a/wiki/src/doc/upgrade/error/download.de.po
+++ b/wiki/src/doc/upgrade/error/download.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not download the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while downloading the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -26,36 +26,35 @@ msgid "The upgrade could not be downloaded."
msgstr ""
#. type: Plain text
+msgid "This is probably caused by a network connection problem."
+msgstr ""
+
+#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to try upgrading again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node, or the web mirror being used, or "
-"anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Bullet: '* '
+#. type: Bullet: ' - '
msgid ""
-"Malicious mirror preventing upgrades (missing or corrupted files, "
-"misconfiguration, etc.)"
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, our website, or one of our mirrors."
msgstr ""
#. type: Plain text
-msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/download.fr.po b/wiki/src/doc/upgrade/error/download.fr.po
index 725b2d4..9054638 100644
--- a/wiki/src/doc/upgrade/error/download.fr.po
+++ b/wiki/src/doc/upgrade/error/download.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not download the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while downloading the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -26,36 +26,35 @@ msgid "The upgrade could not be downloaded."
msgstr ""
#. type: Plain text
+msgid "This is probably caused by a network connection problem."
+msgstr ""
+
+#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to try upgrading again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node, or the web mirror being used, or "
-"anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Bullet: '* '
+#. type: Bullet: ' - '
msgid ""
-"Malicious mirror preventing upgrades (missing or corrupted files, "
-"misconfiguration, etc.)"
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, our website, or one of our mirrors."
msgstr ""
#. type: Plain text
-msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/download.pt.po b/wiki/src/doc/upgrade/error/download.pt.po
index 725b2d4..9054638 100644
--- a/wiki/src/doc/upgrade/error/download.pt.po
+++ b/wiki/src/doc/upgrade/error/download.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Could not download the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while downloading the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -26,36 +26,35 @@ msgid "The upgrade could not be downloaded."
msgstr ""
#. type: Plain text
+msgid "This is probably caused by a network connection problem."
+msgstr ""
+
+#. type: Plain text
msgid ""
-"This is probably caused by a network problem. Restart Tails. If this error "
-"happens again, [[report an error|support/troubleshooting]] including the "
-"complete error message."
+"Check your network connection, and restart Tails to try upgrading again."
msgstr ""
#. type: Plain text
msgid ""
-"Other possible causes for this failure are attacks by an adversary who is "
-"controlling either the Tor exit node, or the web mirror being used, or "
-"anything in-between:"
+"If the problem persists, [[report an error|support/troubleshooting]] and "
+"include in your report the debugging information that appears in the error "
+"message."
msgstr ""
-#. type: Bullet: '* '
-msgid "Endless data attacks"
+#. type: Plain text
+msgid "This error could also be caused by:"
msgstr ""
-#. type: Bullet: '* '
-msgid "Slow retrieval attacks"
+#. type: Bullet: ' - '
+msgid "an error in Tails Upgrader"
msgstr ""
-#. type: Bullet: '* '
+#. type: Bullet: ' - '
msgid ""
-"Malicious mirror preventing upgrades (missing or corrupted files, "
-"misconfiguration, etc.)"
+"a failure or an attack on the Tor exit node being used, your Internet "
+"service provider, our website, or one of our mirrors."
msgstr ""
#. type: Plain text
-msgid ""
-"Read the [[security "
-"discussion|contribute/design/incremental_upgrades#security]] about "
-"incremental upgrades for details."
+msgid "Sending us a report is the best way to further analyse the error."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/install.de.po b/wiki/src/doc/upgrade/error/install.de.po
index ad8dcb4..94196c0 100644
--- a/wiki/src/doc/upgrade/error/install.de.po
+++ b/wiki/src/doc/upgrade/error/install.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Failed to install the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while installing the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -31,8 +31,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " This copy of Tails may be in a broken state. Do not restart Tails.\n"
+msgid "Your Tails device needs to be repaired and might be unable to restart."
msgstr ""
#. type: Plain text
@@ -41,51 +40,43 @@ msgid "</div>\n"
msgstr ""
#. type: Plain text
-msgid "Follow these instructions to repair this copy of Tails:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. [[Report an error|support/troubleshooting]] including:\n"
-" * the complete error message\n"
-" * the output of the two following commands, run in a\n"
-" <span class=\\\"application\\\">Terminal</span>:\n"
+msgid "This is probably caused by a software error in Tails Upgrader."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" ls -l /lib/live/mount/medium/live\n"
-" cat /lib/live/mount/medium/live/Tails.module\n"
+"1. Please [[report an error|support/troubleshooting]] and include in your\n"
+"report:\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Make sure you have another known-working copy of Tails."
+#. type: Bullet: ' - '
+msgid "the debugging information that appears in the error message"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Take note of this page's address so that you can find it again after "
-"restarting."
+" - the output of the five following commands, run in a\n"
+" [[<span class=\\\"application\\\">Terminal</span>|first_steps/introduction_to_gnome_and_the_tails_desktop#terminal]]:\n"
+" <pre>\n"
+" ls -l /lib/live/mount/medium/live\n"
+" cat /lib/live/mount/medium/live/Tails.module\n"
+" mount\n"
+" df -h\n"
+" free -m\n"
+" </pre>\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Shut down the system."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start your known-working copy of Tails."
-msgstr ""
-
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Use Tails Installer to *Clone & Upgrade* the known-working Tails onto the "
-"broken Tails."
+"2. To repair your Tails device, [[manually upgrade|first_steps/upgrade#manual]]\n"
+"it using Tails Installer from another Tails device.\n"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
msgid ""
-"Restart the broken Tails that should now be repaired. If it does not work "
-"correctly, [[report an error|support/troubleshooting]]."
+"If the manual upgrade fails as well, please [[report another error|"
+"first_steps/bug_reporting]]."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/install.fr.po b/wiki/src/doc/upgrade/error/install.fr.po
index ad8dcb4..94196c0 100644
--- a/wiki/src/doc/upgrade/error/install.fr.po
+++ b/wiki/src/doc/upgrade/error/install.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Failed to install the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while installing the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -31,8 +31,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " This copy of Tails may be in a broken state. Do not restart Tails.\n"
+msgid "Your Tails device needs to be repaired and might be unable to restart."
msgstr ""
#. type: Plain text
@@ -41,51 +40,43 @@ msgid "</div>\n"
msgstr ""
#. type: Plain text
-msgid "Follow these instructions to repair this copy of Tails:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. [[Report an error|support/troubleshooting]] including:\n"
-" * the complete error message\n"
-" * the output of the two following commands, run in a\n"
-" <span class=\\\"application\\\">Terminal</span>:\n"
+msgid "This is probably caused by a software error in Tails Upgrader."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" ls -l /lib/live/mount/medium/live\n"
-" cat /lib/live/mount/medium/live/Tails.module\n"
+"1. Please [[report an error|support/troubleshooting]] and include in your\n"
+"report:\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Make sure you have another known-working copy of Tails."
+#. type: Bullet: ' - '
+msgid "the debugging information that appears in the error message"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Take note of this page's address so that you can find it again after "
-"restarting."
+" - the output of the five following commands, run in a\n"
+" [[<span class=\\\"application\\\">Terminal</span>|first_steps/introduction_to_gnome_and_the_tails_desktop#terminal]]:\n"
+" <pre>\n"
+" ls -l /lib/live/mount/medium/live\n"
+" cat /lib/live/mount/medium/live/Tails.module\n"
+" mount\n"
+" df -h\n"
+" free -m\n"
+" </pre>\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Shut down the system."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start your known-working copy of Tails."
-msgstr ""
-
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Use Tails Installer to *Clone & Upgrade* the known-working Tails onto the "
-"broken Tails."
+"2. To repair your Tails device, [[manually upgrade|first_steps/upgrade#manual]]\n"
+"it using Tails Installer from another Tails device.\n"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
msgid ""
-"Restart the broken Tails that should now be repaired. If it does not work "
-"correctly, [[report an error|support/troubleshooting]]."
+"If the manual upgrade fails as well, please [[report another error|"
+"first_steps/bug_reporting]]."
msgstr ""
diff --git a/wiki/src/doc/upgrade/error/install.pt.po b/wiki/src/doc/upgrade/error/install.pt.po
index ad8dcb4..94196c0 100644
--- a/wiki/src/doc/upgrade/error/install.pt.po
+++ b/wiki/src/doc/upgrade/error/install.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-11-30 21:33+0100\n"
+"POT-Creation-Date: 2014-01-10 15:58+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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Failed to install the upgrade\"]]\n"
+msgid "[[!meta title=\"Error while installing the upgrade\"]]\n"
msgstr ""
#. type: Plain text
@@ -31,8 +31,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid " This copy of Tails may be in a broken state. Do not restart Tails.\n"
+msgid "Your Tails device needs to be repaired and might be unable to restart."
msgstr ""
#. type: Plain text
@@ -41,51 +40,43 @@ msgid "</div>\n"
msgstr ""
#. type: Plain text
-msgid "Follow these instructions to repair this copy of Tails:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. [[Report an error|support/troubleshooting]] including:\n"
-" * the complete error message\n"
-" * the output of the two following commands, run in a\n"
-" <span class=\\\"application\\\">Terminal</span>:\n"
+msgid "This is probably caused by a software error in Tails Upgrader."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" ls -l /lib/live/mount/medium/live\n"
-" cat /lib/live/mount/medium/live/Tails.module\n"
+"1. Please [[report an error|support/troubleshooting]] and include in your\n"
+"report:\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Make sure you have another known-working copy of Tails."
+#. type: Bullet: ' - '
+msgid "the debugging information that appears in the error message"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Take note of this page's address so that you can find it again after "
-"restarting."
+" - the output of the five following commands, run in a\n"
+" [[<span class=\\\"application\\\">Terminal</span>|first_steps/introduction_to_gnome_and_the_tails_desktop#terminal]]:\n"
+" <pre>\n"
+" ls -l /lib/live/mount/medium/live\n"
+" cat /lib/live/mount/medium/live/Tails.module\n"
+" mount\n"
+" df -h\n"
+" free -m\n"
+" </pre>\n"
msgstr ""
-#. type: Bullet: '1. '
-msgid "Shut down the system."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start your known-working copy of Tails."
-msgstr ""
-
-#. type: Bullet: '1. '
+#. type: Plain text
+#, no-wrap
msgid ""
-"Use Tails Installer to *Clone & Upgrade* the known-working Tails onto the "
-"broken Tails."
+"2. To repair your Tails device, [[manually upgrade|first_steps/upgrade#manual]]\n"
+"it using Tails Installer from another Tails device.\n"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
msgid ""
-"Restart the broken Tails that should now be repaired. If it does not work "
-"correctly, [[report an error|support/troubleshooting]]."
+"If the manual upgrade fails as well, please [[report another error|"
+"first_steps/bug_reporting]]."
msgstr ""