summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-10-24 02:34:51 +0200
committerTails developers <amnesia@boum.org>2013-10-24 02:34:51 +0200
commit4330d24db79fa21500c97466deb1f28d7821eabc (patch)
treebf7f9e8c6ffe6e22be64bcf96414aadd56b273b9 /wiki/src/doc
parent0622d13caf578a9582246b5be7223c3c3df467b4 (diff)
Move pages and update PO files
- doc/first_steps/usb_installation to doc/first_steps/installation - doc/first_steps/usb_reset doc/first_steps/reset - doc/first_steps/usb_reset/linux doc/first_steps/reset/linux - doc/first_steps/usb_reset/windows doc/first_steps/reset/windows - doc/first_steps/usb_upgrade doc/first_steps/upgrade - doc/first_steps/manual_usb_installation doc/first_steps/installation/manual - doc/first_steps/manual_usb_installation/linux doc/first_steps/installation/manual/linux - doc/first_steps/manual_usb_installation/windows doc/first_steps/installation/manual/windows - doc/first_steps/manual_usb_installation/mac doc/first_steps/installation/manual/mac - contribute/design/usb_installation contribute/design/installation
Diffstat (limited to 'wiki/src/doc')
-rw-r--r--wiki/src/doc/about/features.de.po4
-rw-r--r--wiki/src/doc/about/features.es.po8
-rw-r--r--wiki/src/doc/about/features.fr.po8
-rw-r--r--wiki/src/doc/about/features.pt.po8
-rw-r--r--wiki/src/doc/about/requirements.de.po16
-rw-r--r--wiki/src/doc/about/requirements.es.po16
-rw-r--r--wiki/src/doc/about/requirements.fr.po28
-rw-r--r--wiki/src/doc/about/requirements.pt.po46
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.de.po16
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.es.po16
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fr.po14
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.pt.po29
-rw-r--r--wiki/src/doc/first_steps.index.de.po20
-rw-r--r--wiki/src/doc/first_steps.index.es.po20
-rw-r--r--wiki/src/doc/first_steps.index.fr.po65
-rw-r--r--wiki/src/doc/first_steps.index.mdwn18
-rw-r--r--wiki/src/doc/first_steps.index.pt.po56
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po10
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po10
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po19
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po10
-rw-r--r--wiki/src/doc/first_steps/installation.de.po (renamed from wiki/src/doc/first_steps/usb_installation.es.po)53
-rw-r--r--wiki/src/doc/first_steps/installation.es.po (renamed from wiki/src/doc/first_steps/usb_installation.de.po)53
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po (renamed from wiki/src/doc/first_steps/usb_installation.fr.po)93
-rw-r--r--wiki/src/doc/first_steps/installation.mdwn (renamed from wiki/src/doc/first_steps/usb_installation.mdwn)2
-rw-r--r--wiki/src/doc/first_steps/installation.pt.po (renamed from wiki/src/doc/first_steps/usb_installation.pt.po)85
-rw-r--r--wiki/src/doc/first_steps/installation/manual.de.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.de.po)13
-rw-r--r--wiki/src/doc/first_steps/installation/manual.es.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.es.po)13
-rw-r--r--wiki/src/doc/first_steps/installation/manual.fr.po50
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.de.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.intro.es.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.es.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.intro.de.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.fr.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.intro.fr.po)10
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.mdwn (renamed from wiki/src/doc/first_steps/manual_usb_installation.intro.mdwn)2
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.pt.po (renamed from wiki/src/doc/first_steps/manual_usb_installation.intro.pt.po)8
-rw-r--r--wiki/src/doc/first_steps/installation/manual.mdwn7
-rw-r--r--wiki/src/doc/first_steps/installation/manual.pt.po50
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.de.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux.de.po)43
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.es.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux.es.po)43
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fr.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux.fr.po)84
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.pt.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux.pt.po)103
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.fr.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.fr.png)bin33469 -> 33469 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.png)bin26413 -> 26413 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.de.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/mac.de.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.es.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/mac.es.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.fr.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/mac.fr.po)16
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.mdwn (renamed from wiki/src/doc/first_steps/manual_usb_installation/mac.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.pt.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/mac.pt.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.de.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows.de.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.es.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows.es.po)4
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.fr.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows.fr.po)13
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.mdwn (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.pt.po (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows.pt.po)13
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/01-run.jpg (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/01-run.jpg)bin56935 -> 56935 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/02-run.jpg (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/02-run.jpg)bin53124 -> 53124 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/03-license-agreement.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/03-license-agreement.png)bin18906 -> 18906 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/04-select-tails.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/04-select-tails.png)bin17377 -> 17377 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/05-browse-iso.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/05-browse-iso.png)bin16885 -> 16885 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/06-choose-drive.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/06-choose-drive.png)bin16193 -> 16193 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/07-create.png (renamed from wiki/src/doc/first_steps/manual_usb_installation/windows/07-create.png)bin16180 -> 16180 bytes
-rw-r--r--wiki/src/doc/first_steps/manual_usb_installation.fr.po40
-rw-r--r--wiki/src/doc/first_steps/manual_usb_installation.mdwn7
-rw-r--r--wiki/src/doc/first_steps/manual_usb_installation.pt.po40
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.es.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po51
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn4
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.de.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.es.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.fr.po52
-rw-r--r--wiki/src/doc/first_steps/persistence/delete.pt.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.de.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.es.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.fr.po12
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.pt.po12
-rw-r--r--wiki/src/doc/first_steps/reset.de.po (renamed from wiki/src/doc/first_steps/usb_reset.de.po)8
-rw-r--r--wiki/src/doc/first_steps/reset.es.po (renamed from wiki/src/doc/first_steps/usb_reset.es.po)8
-rw-r--r--wiki/src/doc/first_steps/reset.fr.po (renamed from wiki/src/doc/first_steps/usb_reset.fr.po)26
-rw-r--r--wiki/src/doc/first_steps/reset.intro.de.po (renamed from wiki/src/doc/first_steps/usb_reset.intro.de.po)10
-rw-r--r--wiki/src/doc/first_steps/reset.intro.es.po (renamed from wiki/src/doc/first_steps/usb_reset.intro.es.po)10
-rw-r--r--wiki/src/doc/first_steps/reset.intro.fr.po (renamed from wiki/src/doc/first_steps/usb_reset.intro.fr.po)22
-rw-r--r--wiki/src/doc/first_steps/reset.intro.mdwn (renamed from wiki/src/doc/first_steps/usb_reset.intro.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/reset.intro.pt.po (renamed from wiki/src/doc/first_steps/usb_reset.intro.pt.po)27
-rw-r--r--wiki/src/doc/first_steps/reset.mdwn (renamed from wiki/src/doc/first_steps/usb_reset.mdwn)4
-rw-r--r--wiki/src/doc/first_steps/reset.pt.po45
-rw-r--r--wiki/src/doc/first_steps/reset/linux.de.po (renamed from wiki/src/doc/first_steps/usb_reset/linux.de.po)26
-rw-r--r--wiki/src/doc/first_steps/reset/linux.es.po (renamed from wiki/src/doc/first_steps/usb_reset/linux.es.po)26
-rw-r--r--wiki/src/doc/first_steps/reset/linux.fr.po (renamed from wiki/src/doc/first_steps/usb_reset/linux.fr.po)71
-rw-r--r--wiki/src/doc/first_steps/reset/linux.mdwn (renamed from wiki/src/doc/first_steps/usb_reset/linux.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/reset/linux.pt.po (renamed from wiki/src/doc/first_steps/usb_reset/linux.pt.po)71
-rw-r--r--wiki/src/doc/first_steps/reset/windows.de.po (renamed from wiki/src/doc/first_steps/usb_reset/windows.de.po)35
-rw-r--r--wiki/src/doc/first_steps/reset/windows.es.po (renamed from wiki/src/doc/first_steps/usb_reset/windows.es.po)35
-rw-r--r--wiki/src/doc/first_steps/reset/windows.fr.po (renamed from wiki/src/doc/first_steps/usb_reset/windows.fr.po)83
-rw-r--r--wiki/src/doc/first_steps/reset/windows.mdwn (renamed from wiki/src/doc/first_steps/usb_reset/windows.mdwn)0
-rw-r--r--wiki/src/doc/first_steps/reset/windows.pt.po (renamed from wiki/src/doc/first_steps/usb_reset/windows.pt.po)83
-rw-r--r--wiki/src/doc/first_steps/shutdown.de.po4
-rw-r--r--wiki/src/doc/first_steps/shutdown.es.po4
-rw-r--r--wiki/src/doc/first_steps/shutdown.fr.po12
-rw-r--r--wiki/src/doc/first_steps/shutdown.pt.po4
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po (renamed from wiki/src/doc/first_steps/usb_upgrade.de.po)42
-rw-r--r--wiki/src/doc/first_steps/upgrade.es.po (renamed from wiki/src/doc/first_steps/usb_upgrade.es.po)42
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po (renamed from wiki/src/doc/first_steps/usb_upgrade.fr.po)75
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn (renamed from wiki/src/doc/first_steps/usb_upgrade.mdwn)4
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po (renamed from wiki/src/doc/first_steps/usb_upgrade.pt.po)69
-rw-r--r--wiki/src/doc/first_steps/usb_reset.pt.po35
-rw-r--r--wiki/src/doc/get.index.de.po4
-rw-r--r--wiki/src/doc/get.index.es.po4
-rw-r--r--wiki/src/doc/get.index.fr.po15
-rw-r--r--wiki/src/doc/get.index.pt.po36
-rw-r--r--wiki/src/doc/introduction.de.po18
-rw-r--r--wiki/src/doc/introduction.es.po29
-rw-r--r--wiki/src/doc/introduction.fr.po15
-rw-r--r--wiki/src/doc/introduction.mdwn2
-rw-r--r--wiki/src/doc/introduction.pt.po58
116 files changed, 1613 insertions, 992 deletions
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 3b2842f..3da2367 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-09 17:14+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,7 +141,7 @@ msgstr ""
#| "devices support, such as USB memory sticks"
msgid ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to "
-"install and use encrypted storage devices, e.g. for USB sticks"
+"install and use encrypted storage devices, for example USB sticks"
msgstr ""
"benutzerfreundlicher Support für [LUKS](http://en.wikipedia.org/wiki/LUKS)-"
"verschlüsselte Speichermedien, wie zum Beispiel USB-Sticks"
diff --git a/wiki/src/doc/about/features.es.po b/wiki/src/doc/about/features.es.po
index 305be24..2fef9c8 100644
--- a/wiki/src/doc/about/features.es.po
+++ b/wiki/src/doc/about/features.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-09 17:14+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -184,9 +184,13 @@ msgid "Encryption & Privacy\n"
msgstr "Criptografía y Privacidad\n"
#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] "
+#| "to install and use encrypted storage devices, e.g. for USB sticks"
msgid ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to "
-"install and use encrypted storage devices, e.g. for USB sticks"
+"install and use encrypted storage devices, for example USB sticks"
msgstr ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) y [[!wikipedia Palimpsest]] "
"parainstalar y usar equipos de almacenamiento encriptados"
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index ad748bb..9ff637d 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-09 13:08+0200\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2013-08-12 11:52-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,9 +162,13 @@ msgid "Encryption & Privacy\n"
msgstr "Chiffrement et Vie Privée\n"
#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] "
+#| "to install and use encrypted storage devices, e.g. for USB sticks"
msgid ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to "
-"install and use encrypted storage devices, e.g. for USB sticks"
+"install and use encrypted storage devices, for example USB sticks"
msgstr ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) et [Palimpsest](https://secure."
"wikimedia.org/wikipedia/en/wiki/Palimpsest_Disk_Utility) pour créer et "
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index 5b8acae..560a8eb 100644
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-09 17:14+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-07-08 23:08-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -179,9 +179,13 @@ msgid "Encryption & Privacy\n"
msgstr "Criptografia & Privacidade\n"
#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] "
+#| "to install and use encrypted storage devices, e.g. for USB sticks"
msgid ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to "
-"install and use encrypted storage devices, e.g. for USB sticks"
+"install and use encrypted storage devices, for example USB sticks"
msgstr ""
"[LUKS](http://en.wikipedia.org/wiki/LUKS) e [[!wikipedia Palimpsest]] para "
"instalar e usar dispositivos de armazenamento criptografados"
diff --git a/wiki/src/doc/about/requirements.de.po b/wiki/src/doc/about/requirements.de.po
index 6fdaa5d..549816b 100644
--- a/wiki/src/doc/about/requirements.de.po
+++ b/wiki/src/doc/about/requirements.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 16:40+0100\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,21 +29,21 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
-"external USB DVD reader."
+"Either **an internal or external DVD reader** or the possibility to **boot "
+"from a USB stick or SD card**."
msgstr ""
#. type: Bullet: '- '
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">[[!"
-"wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia ARM]]</"
-"span>."
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM]]</span>."
msgstr ""
#. type: Bullet: '- '
msgid ""
-"**1 GB of RAM** to work smoothly. Tails is known to work with less memory but "
-"you might experience strange behaviours or crashes."
+"**1 GB of RAM** to work smoothly. Tails is known to work with less memory "
+"but you might experience strange behaviours or crashes."
msgstr ""
diff --git a/wiki/src/doc/about/requirements.es.po b/wiki/src/doc/about/requirements.es.po
index 6fdaa5d..549816b 100644
--- a/wiki/src/doc/about/requirements.es.po
+++ b/wiki/src/doc/about/requirements.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 16:40+0100\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,21 +29,21 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
-"external USB DVD reader."
+"Either **an internal or external DVD reader** or the possibility to **boot "
+"from a USB stick or SD card**."
msgstr ""
#. type: Bullet: '- '
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">[[!"
-"wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia ARM]]</"
-"span>."
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM]]</span>."
msgstr ""
#. type: Bullet: '- '
msgid ""
-"**1 GB of RAM** to work smoothly. Tails is known to work with less memory but "
-"you might experience strange behaviours or crashes."
+"**1 GB of RAM** to work smoothly. Tails is known to work with less memory "
+"but you might experience strange behaviours or crashes."
msgstr ""
diff --git a/wiki/src/doc/about/requirements.fr.po b/wiki/src/doc/about/requirements.fr.po
index c1e9def..28ad3d7 100644
--- a/wiki/src/doc/about/requirements.fr.po
+++ b/wiki/src/doc/about/requirements.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-17 15:08+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-06-08 15:20-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,9 +30,13 @@ msgstr ""
"requise :"
#. type: Bullet: '- '
+#, fuzzy
+#| msgid ""
+#| "Either **a DVD reader** or possibility to **boot from a USB stick** or an "
+#| "external USB DVD reader."
msgid ""
-"Either **a DVD reader** or possibility to **boot from a USB stick** or an "
-"external USB DVD reader."
+"Either **an internal or external DVD reader** or the possibility to **boot "
+"from a USB stick or SD card**."
msgstr ""
"Soit **un lecteur de DVD** ou bien la possibilité de **démarrer sur une clé "
"USB**, ou encore un lecteur de DVD externe."
@@ -41,21 +45,21 @@ msgstr ""
msgid ""
"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
"compatible processor: **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** and others but not <span "
-"class=\"definition\">[[!wikipedia PowerPC]]</span> nor <span "
-"class=\"definition\">[[!wikipedia ARM]]</span>."
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM]]</span>."
msgstr ""
"Tails nécessite un processeur compatible <span class=\"definition\">[[!"
"wikipedia x86]]</span> : **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** ou autre. Tails ne fonctionne ni sur <span class="
-"\"definition\">[[!wikipedia PowerPC]]</span> ni sur <span class=\"definition"
-"\">[[!wikipedia ARM]]</span>."
+"IBM_PC_compatible]]</span>** ou autre. Tails ne fonctionne ni sur <span "
+"class=\"definition\">[[!wikipedia PowerPC]]</span> ni sur <span class="
+"\"definition\">[[!wikipedia ARM]]</span>."
#. type: Bullet: '- '
msgid ""
"**1 GB of RAM** to work smoothly. Tails is known to work with less memory "
"but you might experience strange behaviours or crashes."
msgstr ""
-"**1 GB de RAM** pour une utilisation confortable. Tails a la réputation de se "
-"contenter de moins de mémoire, mais vous pourriez rencontrer des comportements "
-"anormaux ou des crashes."
+"**1 GB de RAM** pour une utilisation confortable. Tails a la réputation de "
+"se contenter de moins de mémoire, mais vous pourriez rencontrer des "
+"comportements anormaux ou des crashes."
diff --git a/wiki/src/doc/about/requirements.pt.po b/wiki/src/doc/about/requirements.pt.po
index d64ad70..f0a802d 100644
--- a/wiki/src/doc/about/requirements.pt.po
+++ b/wiki/src/doc/about/requirements.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-17 15:08+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-07-03 16:46-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,18 +21,44 @@ msgid "[[!meta title=\"System requirements\"]]\n"
msgstr "[[!meta title=\"Requisitos de sistema\"]]\n"
#. type: Plain text
-msgid "Tails should work on any reasonably recent PC computer, say manufactured after 2005. Here is a detailed list of requirements:"
-msgstr "Tails deve funcionar em qualquer computador pessoal razoavelmente recente, digamos fabricado após 2005. Aqui está a lista detalhada de requisitos:"
+msgid ""
+"Tails should work on any reasonably recent PC computer, say manufactured "
+"after 2005. Here is a detailed list of requirements:"
+msgstr ""
+"Tails deve funcionar em qualquer computador pessoal razoavelmente recente, "
+"digamos fabricado após 2005. Aqui está a lista detalhada de requisitos:"
#. type: Bullet: '- '
-msgid "Either **a DVD reader** or possibility to **boot from a USB stick** or an external USB DVD reader."
-msgstr "Um **leitor de DVD** ou a possibilidade de **iniciar a partir de uma memória USB** ou de um leitor USB externo de DVD."
+#, fuzzy
+#| msgid ""
+#| "Either **a DVD reader** or possibility to **boot from a USB stick** or an "
+#| "external USB DVD reader."
+msgid ""
+"Either **an internal or external DVD reader** or the possibility to **boot "
+"from a USB stick or SD card**."
+msgstr ""
+"Um **leitor de DVD** ou a possibilidade de **iniciar a partir de uma memória "
+"USB** ou de um leitor USB externo de DVD."
#. type: Bullet: '- '
-msgid "Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> compatible processor: **<span class=\"definition\">[[!wikipedia IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia ARM]]</span>."
-msgstr "Tails requer um processador compatível com <span class=\"definition\">[[!wikipedia x86]]</span>: **<span class=\"definition\">[[!wikipedia IBM_PC_compatible]]</span>** e outros, mas não <span class=\"definition\">[[!wikipedia PowerPC]]</span> ou <span class=\"definition\">[[!wikipedia ARM]]</span>."
+msgid ""
+"Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
+"compatible processor: **<span class=\"definition\">[[!wikipedia "
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM]]</span>."
+msgstr ""
+"Tails requer um processador compatível com <span class=\"definition\">[[!"
+"wikipedia x86]]</span>: **<span class=\"definition\">[[!wikipedia "
+"IBM_PC_compatible]]</span>** e outros, mas não <span class=\"definition\">[[!"
+"wikipedia PowerPC]]</span> ou <span class=\"definition\">[[!wikipedia ARM]]</"
+"span>."
#. type: Bullet: '- '
-msgid "**1 GB of RAM** to work smoothly. Tails is known to work with less memory but you might experience strange behaviours or crashes."
-msgstr "**1 GB de RAM** para funcionar suavemente. Tails é conhecido por trabalhar com pouca memória mas você poderá experienciar comportamentos estranhos ou travamentos."
-
+msgid ""
+"**1 GB of RAM** to work smoothly. Tails is known to work with less memory "
+"but you might experience strange behaviours or crashes."
+msgstr ""
+"**1 GB de RAM** para funcionar suavemente. Tails é conhecido por trabalhar "
+"com pouca memória mas você poderá experienciar comportamentos estranhos ou "
+"travamentos."
diff --git a/wiki/src/doc/advanced_topics/virtualization.de.po b/wiki/src/doc/advanced_topics/virtualization.de.po
index a3c3b5a..c9547fc 100644
--- a/wiki/src/doc/advanced_topics/virtualization.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 16:40+0100\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,9 +58,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"The main issue is if the host operating system is compromised with a software "
-"keylogger or other malware, which Tails does not provide any protection "
-"against – in fact, that is impossible."
+"The main issue is if the host operating system is compromised with a "
+"software keylogger or other malware, which Tails does not provide any "
+"protection against – in fact, that is impossible."
msgstr ""
#. type: Plain text
@@ -69,8 +69,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"As such, this is only recommended when the other alternative is not an option "
-"or when you are absolutely sure that your host system is clean."
+"As such, this is only recommended when the other alternative is not an "
+"option or when you are absolutely sure that your host system is clean."
msgstr ""
#. type: Plain text
@@ -90,8 +90,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a DVD or USB "
-"stick."
+"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
+"or SD card instead."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/advanced_topics/virtualization.es.po b/wiki/src/doc/advanced_topics/virtualization.es.po
index a3c3b5a..c9547fc 100644
--- a/wiki/src/doc/advanced_topics/virtualization.es.po
+++ b/wiki/src/doc/advanced_topics/virtualization.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 16:40+0100\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,9 +58,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"The main issue is if the host operating system is compromised with a software "
-"keylogger or other malware, which Tails does not provide any protection "
-"against – in fact, that is impossible."
+"The main issue is if the host operating system is compromised with a "
+"software keylogger or other malware, which Tails does not provide any "
+"protection against – in fact, that is impossible."
msgstr ""
#. type: Plain text
@@ -69,8 +69,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"As such, this is only recommended when the other alternative is not an option "
-"or when you are absolutely sure that your host system is clean."
+"As such, this is only recommended when the other alternative is not an "
+"option or when you are absolutely sure that your host system is clean."
msgstr ""
#. type: Plain text
@@ -90,8 +90,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a DVD or USB "
-"stick."
+"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
+"or SD card instead."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/advanced_topics/virtualization.fr.po b/wiki/src/doc/advanced_topics/virtualization.fr.po
index 27a1a64..d483a4c 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2013-09-09 13:08+0200\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2013-06-17 19:11-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,9 +122,13 @@ msgstr ""
"produire."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you are unsure, and if you can afford it, just run Tails from a DVD or "
+#| "USB stick."
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a DVD or "
-"USB stick."
+"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
+"or SD card instead."
msgstr ""
"Si vous n'êtes pas sûr, et si vous pouvez vous le permettre, utilisez Tails "
"depuis un DVD ou une clé USB."
@@ -215,8 +219,8 @@ msgstr ""
#~ "Tails fonctionne très bien dans [VMWare](http://www.vmware.com/) avec "
#~ "l'application suivane [VMWare Virtual Appliance](http://files1.cjb.net/"
#~ "incognito/incognito-vmware-1.0.zip) ([signature](http://files1.cjb.net/"
-#~ "incognito/incognito-vmware-1.0.zip.asc)) conçue par les développeurs "
-#~ "d'T(A)ILS. décompressez simplement le fichier et suivez les instructions "
+#~ "incognito/incognito-vmware-1.0.zip.asc)) conçue par les développeurs d'T"
+#~ "(A)ILS. décompressez simplement le fichier et suivez les instructions "
#~ "fournies dans le `README.txt` qui est fournit avec l'archive. "
#~ "L'application gratuite ([as in beer](http://en.wikipedia.org/wiki/"
#~ "Gratis_versus_Libre)) [VMWare Player](http://www.vmware.com/products/"
diff --git a/wiki/src/doc/advanced_topics/virtualization.pt.po b/wiki/src/doc/advanced_topics/virtualization.pt.po
index 2a46587..c9547fc 100644
--- a/wiki/src/doc/advanced_topics/virtualization.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-06-06 23:06+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,13 +31,13 @@ msgid ""
"Certain users might not want to restart the computer every time they wish to "
"use the Internet anonymously with Tails. For those, a so called [virtual "
"machine](http://en.wikipedia.org/wiki/Virtual_machine) can be used to run "
-"Tails inside the \"host\" operating system installed on the computer "
-"(e.g. Microsoft Windows, Mac OS X, etc.). Essentially these programs "
-"emulate real computers that you can run \"guest\" operating systems (in this "
-"case Tails) in so they appear in a window within the host operating "
-"system. Using one of these technologies allows for convenient access to "
-"Tails's features in a protected environment while you at the same time have "
-"access to your normal operation system."
+"Tails inside the \"host\" operating system installed on the computer (e.g. "
+"Microsoft Windows, Mac OS X, etc.). Essentially these programs emulate real "
+"computers that you can run \"guest\" operating systems (in this case Tails) "
+"in so they appear in a window within the host operating system. Using one of "
+"these technologies allows for convenient access to Tails's features in a "
+"protected environment while you at the same time have access to your normal "
+"operation system."
msgstr ""
#. type: Title =
@@ -75,9 +75,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"That's why Tails warns you when you are running it inside a virtual "
-"machine. Do not expect Tails to protect you if you run it in a virtual "
-"machine if you do not trust the host computer, Tails is not magical!"
+"That's why Tails warns you when you are running it inside a virtual machine. "
+"Do not expect Tails to protect you if you run it in a virtual machine if you "
+"do not trust the host computer, Tails is not magical!"
msgstr ""
#. type: Plain text
@@ -90,8 +90,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you are unsure, and if you can afford it, just run Tails from a DVD or "
-"USB stick."
+"If you are unsure, and if you can afford it, run Tails from a DVD, USB stick "
+"or SD card instead."
msgstr ""
#. type: Title =
@@ -106,5 +106,6 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid "In the future, it will be possible to easily start [[Tails within Windows]]."
+msgid ""
+"In the future, it will be possible to easily start [[Tails within Windows]]."
msgstr ""
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index aa922a5..4369d67 100644
--- a/wiki/src/doc/first_steps.index.de.po
+++ b/wiki/src/doc/first_steps.index.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-23 19:34+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,15 +19,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]]\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
+" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" using [[!traillink Linux|first_steps/reset/linux]],\n"
+" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
diff --git a/wiki/src/doc/first_steps.index.es.po b/wiki/src/doc/first_steps.index.es.po
index aa922a5..4369d67 100644
--- a/wiki/src/doc/first_steps.index.es.po
+++ b/wiki/src/doc/first_steps.index.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-23 19:34+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,15 +19,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]]\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
+" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" using [[!traillink Linux|first_steps/reset/linux]],\n"
+" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index ccbf39a..e3a5f99 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-10 13:30+0000\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2013-10-10 12:37-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -17,17 +17,42 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!traillink Installing_onto_a_USB_Stick|first_steps/installation]] (recommended)\n"
+#| " - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/installation/manual]],\n"
+#| " for [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+#| " for [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+#| " for [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+#| " - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/reset]],\n"
+#| " for [[!traillink Linux|first_steps/reset/linux]],\n"
+#| " for [[!traillink Windows|first_steps/reset/windows]]\n"
+#| " - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/upgrade]]\n"
+#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
+#| " - [[!traillink Startup_Options|first_steps/startup_options]]\n"
+#| " - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
+#| " - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
+#| " - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
+#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
+#| " - [[!traillink Persistence|first_steps/persistence]]\n"
+#| " - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
+#| " - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
+#| " - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
+#| " - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
+#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
+#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
+#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]]\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
+" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" using [[!traillink Linux|first_steps/reset/linux]],\n"
+" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
@@ -44,15 +69,15 @@ msgid ""
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgstr ""
-" - [[!traillink Installation_sur_une_clé_USB|first_steps/usb_installation]] (recommandée)\n"
-" - [[!traillink Installation_manuelle_sur_une_clé_USB|first_steps/manual_usb_installation]],\n"
-" avec [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" avec [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-" avec [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Désinstaller_Tails_ou_réinitialiser_une_clé_USB|first_steps/usb_reset]],\n"
-" avec [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" avec [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Mettre_à_jour_une_clé_USB_Tails|first_steps/usb_upgrade]]\n"
+" - [[!traillink Installation_sur_une_clé_USB|first_steps/installation]] (recommandée)\n"
+" - [[!traillink Installation_manuelle_sur_une_clé_USB|first_steps/installation/manual]],\n"
+" avec [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" avec [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" avec [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - [[!traillink Désinstaller_Tails_ou_réinitialiser_une_clé_USB|first_steps/reset]],\n"
+" avec [[!traillink Linux|first_steps/reset/linux]],\n"
+" avec [[!traillink Windows|first_steps/reset/windows]]\n"
+" - [[!traillink Mettre_à_jour_une_clé_USB_Tails|first_steps/upgrade]]\n"
" - [[!traillink Démarrer_Tails|first_steps/start_tails]]\n"
" - [[!traillink Options_de_démarrage|first_steps/startup_options]]\n"
" - [[!traillink Mot_de_passe_administrateur|first_steps/startup_options/administration_password]]\n"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index 825cd25..89e1566 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,12 +1,12 @@
- - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/usb_installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/manual_usb_installation]],
- using [[!traillink Linux|first_steps/manual_usb_installation/linux]],
- using [[!traillink Windows|first_steps/manual_usb_installation/windows]]
- using [[!traillink Mac|first_steps/manual_usb_installation/mac]]
- - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/usb_reset]],
- using [[!traillink Linux|first_steps/usb_reset/linux]],
- using [[!traillink Windows|first_steps/usb_reset/windows]]
- - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/usb_upgrade]]
+ - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)
+ - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],
+ using [[!traillink Linux|first_steps/installation/manual/linux]],
+ using [[!traillink Windows|first_steps/installation/manual/windows]]
+ using [[!traillink Mac|first_steps/installation/manual/mac]]
+ - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],
+ using [[!traillink Linux|first_steps/reset/linux]],
+ using [[!traillink Windows|first_steps/reset/windows]]
+ - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_Options|first_steps/startup_options]]
- [[!traillink Administration_Password|first_steps/startup_options/administration_password]]
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index eb1214a..10ca610 100644
--- a/wiki/src/doc/first_steps.index.pt.po
+++ b/wiki/src/doc/first_steps.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-29 16:23+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-10-09 20:03-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
-#| " - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-#| " - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-#| " for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-#| " for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-#| " for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-#| " - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-#| " for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-#| " for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-#| " - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
+#| " - [[!traillink Installing_onto_a_USB_Stick|first_steps/installation]] (recommended)\n"
+#| " - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/installation/manual]],\n"
+#| " for [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+#| " for [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+#| " for [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+#| " - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/reset]],\n"
+#| " for [[!traillink Linux|first_steps/reset/linux]],\n"
+#| " for [[!traillink Windows|first_steps/reset/windows]]\n"
+#| " - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/upgrade]]\n"
#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
#| " - [[!traillink Startup_Options|first_steps/startup_options]]\n"
#| " - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
@@ -41,15 +41,15 @@ msgstr ""
#| " - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-" for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-" for [[!traillink Windows|first_steps/manual_usb_installation/windows]]\n"
-" for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-" for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-" for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-" - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
+" - [[!traillink Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation]] (recommended)\n"
+" - [[!traillink Manually_Installing_onto_a_USB_Stick_or_SD_card|first_steps/installation/manual]],\n"
+" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" using [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - [[!traillink Uninstalling_Tails_or_resetting_a_USB_Stick_or_SD_card|first_steps/reset]],\n"
+" using [[!traillink Linux|first_steps/reset/linux]],\n"
+" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" - [[!traillink Upgrading_a_Tails_USB_Stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_Options|first_steps/startup_options]]\n"
" - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
@@ -66,15 +66,15 @@ msgid ""
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgstr ""
-" - [[Instalando em uma memória USB|first_steps/usb_installation]] (recomendado)\n"
-" - [[Instalando manualmente em uma memória USB|first_steps/manual_usb_installation]],\n"
-" em [[Linux|first_steps/manual_usb_installation/linux]],\n"
-" em [[Windows|first_steps/manual_usb_installation/windows]],\n"
-" em [[Mac|first_steps/manual_usb_installation/mac]]\n"
-" - [[Desinstalando Tails ou Resetando uma memória USB|first_steps/usb_reset]],\n"
-" em [[Linux|first_steps/usb_reset/linux]],\n"
-" em [[Windows|first_steps/usb_reset/windows]]\n"
-" - [[Atualizando uma memória USB com Tails|first_steps/usb_upgrade]]\n"
+" - [[Instalando em uma memória USB|first_steps/installation]] (recomendado)\n"
+" - [[Instalando manualmente em uma memória USB|first_steps/installation/manual]],\n"
+" em [[Linux|first_steps/installation/manual/linux]],\n"
+" em [[Windows|first_steps/installation/manual/windows]],\n"
+" em [[Mac|first_steps/installation/manual/mac]]\n"
+" - [[Desinstalando Tails ou Resetando uma memória USB|first_steps/reset]],\n"
+" em [[Linux|first_steps/reset/linux]],\n"
+" em [[Windows|first_steps/reset/windows]]\n"
+" - [[Atualizando uma memória USB com Tails|first_steps/upgrade]]\n"
" - [[Inicie o Tails|first_steps/start_tails]]\n"
" - [[Opções de Inicialização|first_steps/startup_options]]\n"
" - [[Senha de Administração|first_steps/startup_options/administration_password]]\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
index 08937aa..4b6089b 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,10 +68,10 @@ msgstr ""
#. type: Bullet: '3. '
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
-"manually|/doc/first_steps/manual_usb_installation]], USB stick [[installed "
-"with Tails installer|/doc/first_steps/manual_usb_installation]]? Keep in "
-"mind that, we do not support any other installation method than the ones "
-"listed above."
+"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
+"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
+"that, we do not support any other installation method than the ones listed "
+"above."
msgstr ""
#. type: Bullet: '4. '
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
index 08937aa..4b6089b 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,10 +68,10 @@ msgstr ""
#. type: Bullet: '3. '
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
-"manually|/doc/first_steps/manual_usb_installation]], USB stick [[installed "
-"with Tails installer|/doc/first_steps/manual_usb_installation]]? Keep in "
-"mind that, we do not support any other installation method than the ones "
-"listed above."
+"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
+"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
+"that, we do not support any other installation method than the ones listed "
+"above."
msgstr ""
#. type: Bullet: '4. '
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
index 595b926..c752c41 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: 2013-09-19 21:37-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,21 +82,21 @@ msgstr ""
#, fuzzy
#| msgid ""
#| "From which media are you trying to start Tails: DVD, USB stick "
-#| "[[installed manually|/doc/first_steps/manual_usb_installation]], USB "
+#| "[[installed manually|/doc/first_steps/installation/manual]], USB "
#| "stick [[installed with Tails USB installer|/doc/first_steps/"
-#| "manual_usb_installation]]? Keep in mind that, we do not support any other "
+#| "installation/manual]]? Keep in mind that, we do not support any other "
#| "installation method than the ones listed above."
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
-"manually|/doc/first_steps/manual_usb_installation]], USB stick [[installed "
-"with Tails installer|/doc/first_steps/manual_usb_installation]]? Keep in "
-"mind that, we do not support any other installation method than the ones "
-"listed above."
+"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
+"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
+"that, we do not support any other installation method than the ones listed "
+"above."
msgstr ""
"Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé USB "
-"[[installée manuellement|/doc/first_steps/manual_usb_installation]], clé USB "
+"[[installée manuellement|/doc/first_steps/installation/manual]], clé USB "
"[[installée avec l'installeur USB Tails|/doc/first_steps/"
-"manual_usb_installation]] ? Sachez que nous ne prenons en charge aucun autre "
+"installation/manual]] ? Sachez que nous ne prenons en charge aucun autre "
"moyen d'installation que ceux décrits ci-dessus."
#. type: Bullet: '4. '
@@ -214,6 +214,7 @@ msgid " <div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
" <strong>When removing this option, if an adversary installed a fake\n"
" Tails on an internal hard disk, then you will likely be starting\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
index 9fa517a..1ee21cd 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
@@ -27,9 +27,9 @@ starting Tails.
message that appears on the screen, if any.
3. From which media are you trying to start Tails: DVD, USB stick
- [[installed manually|/doc/first_steps/manual_usb_installation]], USB
+ [[installed manually|doc/first_steps/installation/manual]], USB
stick [[installed with Tails
- Installer|/doc/first_steps/manual_usb_installation]], SD card? Keep in mind
+ Installer|doc/first_steps/installation/manual]], SD card? Keep in mind
that, we do not support any other installation method than the ones
listed above.
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
index 08937aa..4b6089b 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,10 +68,10 @@ msgstr ""
#. type: Bullet: '3. '
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
-"manually|/doc/first_steps/manual_usb_installation]], USB stick [[installed "
-"with Tails installer|/doc/first_steps/manual_usb_installation]]? Keep in "
-"mind that, we do not support any other installation method than the ones "
-"listed above."
+"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
+"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
+"that, we do not support any other installation method than the ones listed "
+"above."
msgstr ""
#. type: Bullet: '4. '
diff --git a/wiki/src/doc/first_steps/usb_installation.es.po b/wiki/src/doc/first_steps/installation.de.po
index b774d2e..d185b7a 100644
--- a/wiki/src/doc/first_steps/usb_installation.es.po
+++ b/wiki/src/doc/first_steps/installation.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:55+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
-msgid "Tails includes a custom USB installer."
+msgid "Tails includes a custom installer for USB sticks and SD cards."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"In order to use <span class=\"application\">Tails installer</span>, you need\n"
-"to start Tails from another media, and clone it onto the USB stick that you want\n"
-"to install. You can either:\n"
+"In order to use <span class=\"application\">Tails Installer</span>, you need\n"
+"to start Tails from another media, and clone it onto the device of your\n"
+"choice, USB stick or SD card. To do that, you can either:\n"
msgstr ""
#. type: Bullet: ' - '
@@ -38,21 +38,21 @@ msgid "**[[Burn a Tails DVD|download#support]]** (recommended)."
msgstr ""
#. type: Bullet: ' - '
-msgid "**Use another Tails USB stick**, for example from a friend."
+msgid "**Use another Tails USB stick or SD card**, for example from a friend."
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"**[[Manually install Tails onto another USB stick|"
-"manual_usb_installation]]**, if you can't use a DVD."
+"**[[Manually install Tails onto another USB stick or SD card|installation/"
+"manual]]**, if you cannot use a DVD."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"Using <span class=\"application\">Tails installer</span> allows you to\n"
+"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
-"left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
+"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
msgstr ""
#. type: Title =
@@ -68,8 +68,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
-"<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
+"<ul>\n"
+"<li><strong>All the data on the installed device will be\n"
+"lost.</strong></li>\n"
+"<li><strong>This operation does not [[securely\n"
+"delete|encryption_and_privacy/secure_deletion]] the lost data on the\n"
+"installed device.</strong></li>\n"
+"<li><strong>This operation does not copy the persistent volume of the\n"
+"device which is being cloned.</strong></li>\n"
+"</ul>\n"
msgstr ""
#. type: Plain text
@@ -79,8 +86,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from another media than the USB stick onto which you want to "
-"install Tails."
+"Start Tails from another media than the device, USB stick or SD card, onto "
+"which you want to install Tails."
msgstr ""
#. type: Plain text
@@ -90,32 +97,32 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
#. type: Bullet: '3. '
msgid ""
-"To install onto a new USB stick, click on the <span class=\"button\">Clone & "
+"To install onto a new device, click on the <span class=\"button\">Clone & "
"Install</span> button."
msgstr ""
#. type: Bullet: '4. '
-msgid "Plug the USB stick onto which you want to install Tails."
+msgid "Plug the device onto which you want to install Tails."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
-"drop-down list."
+"Choose this new device from the <span class=\"guilabel\">Target Device</"
+"span> drop-down list."
msgstr ""
#. type: Plain text
@@ -140,5 +147,5 @@ msgstr ""
#, no-wrap
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
-"from this new USB stick.</p>\n"
+"from this new device.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_installation.de.po b/wiki/src/doc/first_steps/installation.es.po
index b774d2e..d185b7a 100644
--- a/wiki/src/doc/first_steps/usb_installation.de.po
+++ b/wiki/src/doc/first_steps/installation.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:55+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
-msgid "Tails includes a custom USB installer."
+msgid "Tails includes a custom installer for USB sticks and SD cards."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"In order to use <span class=\"application\">Tails installer</span>, you need\n"
-"to start Tails from another media, and clone it onto the USB stick that you want\n"
-"to install. You can either:\n"
+"In order to use <span class=\"application\">Tails Installer</span>, you need\n"
+"to start Tails from another media, and clone it onto the device of your\n"
+"choice, USB stick or SD card. To do that, you can either:\n"
msgstr ""
#. type: Bullet: ' - '
@@ -38,21 +38,21 @@ msgid "**[[Burn a Tails DVD|download#support]]** (recommended)."
msgstr ""
#. type: Bullet: ' - '
-msgid "**Use another Tails USB stick**, for example from a friend."
+msgid "**Use another Tails USB stick or SD card**, for example from a friend."
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"**[[Manually install Tails onto another USB stick|"
-"manual_usb_installation]]**, if you can't use a DVD."
+"**[[Manually install Tails onto another USB stick or SD card|installation/"
+"manual]]**, if you cannot use a DVD."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"Using <span class=\"application\">Tails installer</span> allows you to\n"
+"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
-"left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
+"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
msgstr ""
#. type: Title =
@@ -68,8 +68,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
-"<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
+"<ul>\n"
+"<li><strong>All the data on the installed device will be\n"
+"lost.</strong></li>\n"
+"<li><strong>This operation does not [[securely\n"
+"delete|encryption_and_privacy/secure_deletion]] the lost data on the\n"
+"installed device.</strong></li>\n"
+"<li><strong>This operation does not copy the persistent volume of the\n"
+"device which is being cloned.</strong></li>\n"
+"</ul>\n"
msgstr ""
#. type: Plain text
@@ -79,8 +86,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from another media than the USB stick onto which you want to "
-"install Tails."
+"Start Tails from another media than the device, USB stick or SD card, onto "
+"which you want to install Tails."
msgstr ""
#. type: Plain text
@@ -90,32 +97,32 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
#. type: Bullet: '3. '
msgid ""
-"To install onto a new USB stick, click on the <span class=\"button\">Clone & "
+"To install onto a new device, click on the <span class=\"button\">Clone & "
"Install</span> button."
msgstr ""
#. type: Bullet: '4. '
-msgid "Plug the USB stick onto which you want to install Tails."
+msgid "Plug the device onto which you want to install Tails."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
-"drop-down list."
+"Choose this new device from the <span class=\"guilabel\">Target Device</"
+"span> drop-down list."
msgstr ""
#. type: Plain text
@@ -140,5 +147,5 @@ msgstr ""
#, no-wrap
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
-"from this new USB stick.</p>\n"
+"from this new device.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_installation.fr.po b/wiki/src/doc/first_steps/installation.fr.po
index 3dd0f54..15ca90d 100644
--- a/wiki/src/doc/first_steps/usb_installation.fr.po
+++ b/wiki/src/doc/first_steps/installation.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:55+0300\n"
"PO-Revision-Date: 2013-01-02 11:30-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -17,12 +17,15 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Installation sur une clé USB\"]]\n"
#. type: Plain text
-msgid "Tails includes a custom USB installer."
+#, fuzzy
+#| msgid "Tails includes a custom USB installer."
+msgid "Tails includes a custom installer for USB sticks and SD cards."
msgstr "Tails inclut son propre installeur USB."
#. type: Plain text
@@ -32,9 +35,9 @@ msgstr "Tails inclut son propre installeur USB."
#| "to start Tails from another media, and clone it onto the USB stick that you want\n"
#| "to install. You can either:\n"
msgid ""
-"In order to use <span class=\"application\">Tails installer</span>, you need\n"
-"to start Tails from another media, and clone it onto the USB stick that you want\n"
-"to install. You can either:\n"
+"In order to use <span class=\"application\">Tails Installer</span>, you need\n"
+"to start Tails from another media, and clone it onto the device of your\n"
+"choice, USB stick or SD card. To do that, you can either:\n"
msgstr ""
"Afin d'utiliser l'<span class=\"application\">Installeur USB\n"
"Tails</span>, vous devez démarrer Tails depuis un autre support, puis\n"
@@ -46,16 +49,22 @@ msgid "**[[Burn a Tails DVD|download#support]]** (recommended)."
msgstr "**[[Graver un DVD Tails|download#support]]** (recommandé)."
#. type: Bullet: ' - '
-msgid "**Use another Tails USB stick**, for example from a friend."
+#, fuzzy
+#| msgid "**Use another Tails USB stick**, for example from a friend."
+msgid "**Use another Tails USB stick or SD card**, for example from a friend."
msgstr "**Utiliser une autre clé USB Tails**, celle d'un ami par exemple."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "**[[Manually install Tails onto another USB stick|"
+#| "installation/manual]]**, if you can't use a DVD."
msgid ""
-"**[[Manually install Tails onto another USB stick|"
-"manual_usb_installation]]**, if you can't use a DVD."
+"**[[Manually install Tails onto another USB stick or SD card|installation/"
+"manual]]**, if you cannot use a DVD."
msgstr ""
"**[[Installer manuellement Tails sur une autre clé USB|"
-"manual_usb_installation]]**, si vous ne pouvez pas utiliser de DVD."
+"installation/manual]]**, si vous ne pouvez pas utiliser de DVD."
#. type: Plain text
#, fuzzy, no-wrap
@@ -64,9 +73,9 @@ msgstr ""
#| "later **[[create a persistent volume|persistence]]** in the free space\n"
#| "left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
msgid ""
-"Using <span class=\"application\">Tails installer</span> allows you to\n"
+"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
-"left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
+"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
msgstr ""
"Utilisez l'<span class=\"application\">Programme d'installation de Tails</span> vous permet de\n"
"**[[créer un volume persistant|persistence]]** sur l'espace libre de la clé USB. Cela\n"
@@ -83,9 +92,20 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
+#| "<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
msgid ""
-"<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
-"<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
+"<ul>\n"
+"<li><strong>All the data on the installed device will be\n"
+"lost.</strong></li>\n"
+"<li><strong>This operation does not [[securely\n"
+"delete|encryption_and_privacy/secure_deletion]] the lost data on the\n"
+"installed device.</strong></li>\n"
+"<li><strong>This operation does not copy the persistent volume of the\n"
+"device which is being cloned.</strong></li>\n"
+"</ul>\n"
msgstr ""
"<strong>L'intégralité du contenu de la clé sera perdu durant l'opération.</strong><br/>\n"
"<strong>Cette opération ne copiera pas le volume persistant présent sur la clé servant de base au clonage.</strong>\n"
@@ -96,9 +116,13 @@ msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Start Tails from another media than the USB stick onto which you want to "
+#| "install Tails."
msgid ""
-"Start Tails from another media than the USB stick onto which you want to "
-"install Tails."
+"Start Tails from another media than the device, USB stick or SD card, onto "
+"which you want to install Tails."
msgstr ""
"Démarrez Tails depuis un autre support que la clé USB sur laquelle vous "
"souhaitez installer Tails."
@@ -118,9 +142,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
"2. Choisissez\n"
" <span class=\"menuchoice\">\n"
@@ -131,30 +155,43 @@ msgstr ""
" pour démarrer l'<span class=\"application\">Installeur USB Tails</span>.\n"
#. type: Bullet: '3. '
+#, fuzzy
+#| msgid ""
+#| "To install onto a new USB stick, click on the <span class=\"button"
+#| "\">Clone & Install</span> button."
msgid ""
-"To install onto a new USB stick, click on the <span class=\"button\">Clone & "
+"To install onto a new device, click on the <span class=\"button\">Clone & "
"Install</span> button."
msgstr ""
"Pour installer sur une nouvelle clé USB, cliquez sur le bouton <span class="
"\"button\">Cloner & Installer</span>."
#. type: Bullet: '4. '
-msgid "Plug the USB stick onto which you want to install Tails."
+#, fuzzy
+#| msgid "Plug the USB stick onto which you want to install Tails."
+msgid "Plug the device onto which you want to install Tails."
msgstr "Branchez la clé USB sur laquelle vous souhaitez installer Tails."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device, which corresponds to the USB stick, appears in the\n"
+#| " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
"Un nouveau périphérique, correspondant à votre clé USB, apparaît dans le\n"
"menu déroulant <span class=\"guilabel\">Périphérique cible</span>.\n"
#. type: Bullet: '5. '
+#, fuzzy
+#| msgid ""
+#| "Choose the USB stick from the <span class=\"guilabel\">Target Device</"
+#| "span> drop-down list."
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
-"drop-down list."
+"Choose this new device from the <span class=\"guilabel\">Target Device</"
+"span> drop-down list."
msgstr ""
"Sélectionnez votre clé USB dans la liste déroulante <span class=\"guilabel"
"\">Périphérique cible</span>."
@@ -186,9 +223,13 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
+#| "from this new USB stick.</p>\n"
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
-"from this new USB stick.</p>\n"
+"from this new device.</p>\n"
msgstr ""
"<p>Une fois l'installation terminée, vous pouvez [[démarrer Tails|/download/#start]]\n"
"depuis cette nouvelle clé USB.</p>\n"
diff --git a/wiki/src/doc/first_steps/usb_installation.mdwn b/wiki/src/doc/first_steps/installation.mdwn
index 2ceb868..0db39ab 100644
--- a/wiki/src/doc/first_steps/usb_installation.mdwn
+++ b/wiki/src/doc/first_steps/installation.mdwn
@@ -9,7 +9,7 @@ choice, USB stick or SD card. To do that, you can either:
- **[[Burn a Tails DVD|download#support]]** (recommended).
- **Use another Tails USB stick or SD card**, for example from a friend.
- **[[Manually install Tails onto another USB
- stick or SD card|manual_usb_installation]]**, if you cannot use a DVD.
+ stick or SD card|installation/manual]]**, if you cannot use a DVD.
Using <span class="application">Tails Installer</span> allows you to
later **[[create a persistent volume|persistence]]** in the free space
diff --git a/wiki/src/doc/first_steps/usb_installation.pt.po b/wiki/src/doc/first_steps/installation.pt.po
index eb9b803..f326ade 100644
--- a/wiki/src/doc/first_steps/usb_installation.pt.po
+++ b/wiki/src/doc/first_steps/installation.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:55+0300\n"
"PO-Revision-Date: 2012-09-28 10:44-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Instalando em uma memória USB\"]]\n"
#. type: Plain text
#, fuzzy
#| msgid "Tails, version 0.11 or later, includes a custom USB installer."
-msgid "Tails includes a custom USB installer."
+msgid "Tails includes a custom installer for USB sticks and SD cards."
msgstr ""
"Tails, versão 0.11 ou superior, inclui um instalador USB personalizado."
@@ -34,9 +35,9 @@ msgstr ""
#| "to start Tails from another media, and clone it onto the USB stick that you want\n"
#| "to install. You can either:\n"
msgid ""
-"In order to use <span class=\"application\">Tails installer</span>, you need\n"
-"to start Tails from another media, and clone it onto the USB stick that you want\n"
-"to install. You can either:\n"
+"In order to use <span class=\"application\">Tails Installer</span>, you need\n"
+"to start Tails from another media, and clone it onto the device of your\n"
+"choice, USB stick or SD card. To do that, you can either:\n"
msgstr ""
"Para poder utilizar o <span class=\"application\">Tails USB installer</span>, você precisa\n"
"iniciar o Tails a partir de uma outra mídia, e cloná-lo para a memória USB na qual você quer\n"
@@ -51,18 +52,22 @@ msgstr "**[[Gravar um DVD do Tails|download#support]]** (recomendado)."
#| msgid ""
#| "**Use another Tails USB stick**, version 0.11 or later, for example from "
#| "a friend."
-msgid "**Use another Tails USB stick**, for example from a friend."
+msgid "**Use another Tails USB stick or SD card**, for example from a friend."
msgstr ""
"**Usar uma outra memória USB**, com a versão 0.11 ou maior, por exemplo a de "
"uma amiga."
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "**[[Manually install Tails onto another USB stick|"
+#| "installation/manual]]**, if you can't use a DVD."
msgid ""
-"**[[Manually install Tails onto another USB stick|"
-"manual_usb_installation]]**, if you can't use a DVD."
+"**[[Manually install Tails onto another USB stick or SD card|installation/"
+"manual]]**, if you cannot use a DVD."
msgstr ""
"**[[Instalar manualmente o Tails em outra memória USB|"
-"manual_usb_installation]]**, se você não puder utilizar um DVD."
+"installation/manual]]**, se você não puder utilizar um DVD."
#. type: Plain text
#, fuzzy, no-wrap
@@ -71,9 +76,9 @@ msgstr ""
#| "later **[[create a persistent volume|persistence]]** in the free space\n"
#| "left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
msgid ""
-"Using <span class=\"application\">Tails installer</span> allows you to\n"
+"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
-"left on the USB stick. This requires a USB stick of **at least 2 GB**.\n"
+"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
msgstr ""
"O <span class=\"application\">Tails Usb installer</span> te permite **[[criar um\n"
"volume persistente|persistence]]** no espaço livre da sua memória USB. Isto requer\n"
@@ -90,9 +95,20 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
+#| "<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
msgid ""
-"<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
-"<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
+"<ul>\n"
+"<li><strong>All the data on the installed device will be\n"
+"lost.</strong></li>\n"
+"<li><strong>This operation does not [[securely\n"
+"delete|encryption_and_privacy/secure_deletion]] the lost data on the\n"
+"installed device.</strong></li>\n"
+"<li><strong>This operation does not copy the persistent volume of the\n"
+"device which is being cloned.</strong></li>\n"
+"</ul>\n"
msgstr ""
"<p><strong>O conteúdo da memória USB será perdido nesta operação.</strong></p>\n"
"<p><strong>Esta operação não irá clonar o volume persistente da memória USB que está sendo clonada.</strong><p>\n"
@@ -108,8 +124,8 @@ msgstr ""
#| "Start Tails, version 0.11 or later, from another media than the USB stick "
#| "onto which you want to install Tails."
msgid ""
-"Start Tails from another media than the USB stick onto which you want to "
-"install Tails."
+"Start Tails from another media than the device, USB stick or SD card, onto "
+"which you want to install Tails."
msgstr ""
"Inicie o Tails, versão 0.11 ou superior, a partir de uma outra mídia que não "
"seja a memória USB na qual você quer instalar o Tails."
@@ -129,9 +145,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
"2. Escolha\n"
" <span class=\"menuchoice\">\n"
@@ -142,30 +158,43 @@ msgstr ""
" para iniciar o <span class=\"application\">Tails USB installer</span>.\n"
#. type: Bullet: '3. '
+#, fuzzy
+#| msgid ""
+#| "To install onto a new USB stick, click on the <span class=\"button"
+#| "\">Clone & Install</span> button."
msgid ""
-"To install onto a new USB stick, click on the <span class=\"button\">Clone & "
+"To install onto a new device, click on the <span class=\"button\">Clone & "
"Install</span> button."
msgstr ""
"Para instalar em uma nova memória USB, clique no botão <span class=\"button"
"\">Clone & Install</span>."
#. type: Bullet: '4. '
-msgid "Plug the USB stick onto which you want to install Tails."
+#, fuzzy
+#| msgid "Plug the USB stick onto which you want to install Tails."
+msgid "Plug the device onto which you want to install Tails."
msgstr "Conecte a memória USB na qual você quer instalar o Tails."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device, which corresponds to the USB stick, appears in the\n"
+#| " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
" Um novo dispositivo, que corresponde à memória USB, aparece na\n"
" lista <span class=\"guilabel\">Dispositivo de Destino</span>.\n"
#. type: Bullet: '5. '
+#, fuzzy
+#| msgid ""
+#| "Choose the USB stick from the <span class=\"guilabel\">Target Device</"
+#| "span> drop-down list."
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
-"drop-down list."
+"Choose this new device from the <span class=\"guilabel\">Target Device</"
+"span> drop-down list."
msgstr ""
"Escolha a memória USB na lista <span class=\"guilabel\">Dispositivo de "
"Destino</span>."
@@ -197,9 +226,13 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
+#| "from this new USB stick.</p>\n"
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
-"from this new USB stick.</p>\n"
+"from this new device.</p>\n"
msgstr ""
"<p>Depois que a instalação terminar, você pode [[iniciar o Tails|/download/#start]]\n"
"a partir desta nova memória USB.</p>\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.de.po b/wiki/src/doc/first_steps/installation/manual.de.po
index 4385f8a..4d7b108 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.de.po
+++ b/wiki/src/doc/first_steps/installation/manual.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-04-17 16:10+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,24 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Linux|first_steps/manual_usb_installation/linux]]"
+msgid ""
+"[[Manual installation using Linux|first_steps/installation/manual/linux]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Instructions for Windows|first_steps/manual_usb_installation/windows]]"
+"[[Manual installation using Windows|first_steps/installation/manual/windows]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Mac|first_steps/manual_usb_installation/mac]]"
+msgid "[[Manual installation using Mac|first_steps/installation/manual/mac]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.es.po b/wiki/src/doc/first_steps/installation/manual.es.po
index 4385f8a..4d7b108 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.es.po
+++ b/wiki/src/doc/first_steps/installation/manual.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-04-17 16:10+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,24 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Linux|first_steps/manual_usb_installation/linux]]"
+msgid ""
+"[[Manual installation using Linux|first_steps/installation/manual/linux]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Instructions for Windows|first_steps/manual_usb_installation/windows]]"
+"[[Manual installation using Windows|first_steps/installation/manual/windows]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Mac|first_steps/manual_usb_installation/mac]]"
+msgid "[[Manual installation using Mac|first_steps/installation/manual/mac]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/installation/manual.fr.po b/wiki/src/doc/first_steps/installation/manual.fr.po
new file mode 100644
index 0000000..d36349b
--- /dev/null
+++ b/wiki/src/doc/first_steps/installation/manual.fr.po
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
+"PO-Revision-Date: 2012-05-11 16:12-0000\n"
+"Last-Translator: amnesia <amnesia@boum.org>\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
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
+msgstr "[[!meta title=\"Installation manuelle sur une clé USB\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.fr\" raw=\"yes\"]]\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Instructions for Linux|first_steps/installation/manual/linux]]"
+msgid ""
+"[[Manual installation using Linux|first_steps/installation/manual/linux]]"
+msgstr "[[Instructions pour Linux|first_steps/installation/manual/linux]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Instructions for Windows|first_steps/installation/manual/windows]]"
+msgid ""
+"[[Manual installation using Windows|first_steps/installation/manual/windows]]"
+msgstr ""
+"[[Instructions pour Windows|first_steps/installation/manual/windows]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Instructions for Mac|first_steps/installation/manual/mac]]"
+msgid "[[Manual installation using Mac|first_steps/installation/manual/mac]]"
+msgstr "[[Instructions pour un Mac|first_steps/installation/manual/mac]]"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.intro.es.po b/wiki/src/doc/first_steps/installation/manual.intro.de.po
index 5488d99..76f9c7b 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.intro.es.po
+++ b/wiki/src/doc/first_steps/installation/manual.intro.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:20+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"It is recommended to use\n"
-"<span class=\"application\">[[Tails Installer|usb_installation]]</span> to install\n"
+"<span class=\"application\">[[Tails Installer|installation]]</span> to install\n"
"Tails onto a USB stick or SD card. But you might need to use this technique to get a first\n"
"running Tails, and be able to use\n"
"<span class=\"application\">Tails Installer</span> on a second device.\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.intro.de.po b/wiki/src/doc/first_steps/installation/manual.intro.es.po
index 5488d99..76f9c7b 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.intro.de.po
+++ b/wiki/src/doc/first_steps/installation/manual.intro.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:20+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"It is recommended to use\n"
-"<span class=\"application\">[[Tails Installer|usb_installation]]</span> to install\n"
+"<span class=\"application\">[[Tails Installer|installation]]</span> to install\n"
"Tails onto a USB stick or SD card. But you might need to use this technique to get a first\n"
"running Tails, and be able to use\n"
"<span class=\"application\">Tails Installer</span> on a second device.\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.intro.fr.po b/wiki/src/doc/first_steps/installation/manual.intro.fr.po
index 277de02..9cb0501 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.intro.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual.intro.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:20+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: 2012-09-27 11:07-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
#, fuzzy, no-wrap
#| msgid ""
#| "It is recommended to use the\n"
-#| "<span class=\"application\">[[Tails USB installer|usb_installation]]</span> to install\n"
+#| "<span class=\"application\">[[Tails USB installer|installation]]</span> to install\n"
#| "Tails onto a USB stick. But you might need to use this technique to get a first\n"
#| "running Tails, and be able to use the\n"
#| "<span class=\"application\">Tails USB installer</span> on a second USB stick.\n"
msgid ""
"It is recommended to use\n"
-"<span class=\"application\">[[Tails Installer|usb_installation]]</span> to install\n"
+"<span class=\"application\">[[Tails Installer|installation]]</span> to install\n"
"Tails onto a USB stick or SD card. But you might need to use this technique to get a first\n"
"running Tails, and be able to use\n"
"<span class=\"application\">Tails Installer</span> on a second device.\n"
msgstr ""
"L'utilisation de\n"
-"<span class=\"application\">[[l'installeur USB de Tails|usb_installation]]</span> est recommandée\n"
+"<span class=\"application\">[[l'installeur USB de Tails|installation]]</span> est recommandée\n"
"pour installer Tails sur une clé USB. Cependant vous pouvez avoir besoin d'utiliser cette méthode\n"
"pour obtenir un premier Tails fonctionnel, et ensuite utiliser\n"
-"<span class=\"application\">[[l'installeur USB de Tails|usb_installation]]</span> sur une seconde clé USB.\n"
+"<span class=\"application\">[[l'installeur USB de Tails|installation]]</span> sur une seconde clé USB.\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.intro.mdwn b/wiki/src/doc/first_steps/installation/manual.intro.mdwn
index 3ca4245..050bf01 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.intro.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual.intro.mdwn
@@ -1,5 +1,5 @@
It is recommended to use
-<span class="application">[[Tails Installer|usb_installation]]</span> to install
+<span class="application">[[Tails Installer|installation]]</span> to install
Tails onto a USB stick or SD card. But you might need to use this technique to get a first
running Tails, and be able to use
<span class="application">Tails Installer</span> on a second device.
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.intro.pt.po b/wiki/src/doc/first_steps/installation/manual.intro.pt.po
index 604d60f..82b81c1 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation.intro.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual.intro.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 01:20+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: 2012-11-06 15:49-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,18 +19,18 @@ msgstr ""
#, fuzzy, no-wrap
#| msgid ""
#| "It is recommended to use the\n"
-#| "<span class=\"application\">[[Tails USB installer|usb_installation]]</span> to install\n"
+#| "<span class=\"application\">[[Tails USB installer|installation]]</span> to install\n"
#| "Tails onto a USB stick. But you might need to use this technique to get a first\n"
#| "running Tails, and be able to use the\n"
#| "<span class=\"application\">Tails USB installer</span> on a second USB stick.\n"
msgid ""
"It is recommended to use\n"
-"<span class=\"application\">[[Tails Installer|usb_installation]]</span> to install\n"
+"<span class=\"application\">[[Tails Installer|installation]]</span> to install\n"
"Tails onto a USB stick or SD card. But you might need to use this technique to get a first\n"
"running Tails, and be able to use\n"
"<span class=\"application\">Tails Installer</span> on a second device.\n"
msgstr ""
-"É recomendável usar o <span class=\"application\">[[Tails USB installer|usb_installation]]</span>\n"
+"É recomendável usar o <span class=\"application\">[[Tails USB installer|installation]]</span>\n"
"para instalar o Tails em uma memória USB. Apesar disso pode ser que você tenha que utilizar esta técnica\n"
"para obter um primeiro Tails que funcione, para só então poder usar o\n"
"<span class=\"application\">Tails USB installer</span> em uma segunda memória USB.\n"
diff --git a/wiki/src/doc/first_steps/installation/manual.mdwn b/wiki/src/doc/first_steps/installation/manual.mdwn
new file mode 100644
index 0000000..e997d8e
--- /dev/null
+++ b/wiki/src/doc/first_steps/installation/manual.mdwn
@@ -0,0 +1,7 @@
+[[!meta title="Manually installing onto a USB Stick or SD card"]]
+
+[[!inline pages="doc/first_steps/installation/manual.intro" raw="yes"]]
+
+ - [[Manual installation using Linux|first_steps/installation/manual/linux]]
+ - [[Manual installation using Windows|first_steps/installation/manual/windows]]
+ - [[Manual installation using Mac|first_steps/installation/manual/mac]]
diff --git a/wiki/src/doc/first_steps/installation/manual.pt.po b/wiki/src/doc/first_steps/installation/manual.pt.po
new file mode 100644
index 0000000..8892050
--- /dev/null
+++ b/wiki/src/doc/first_steps/installation/manual.pt.po
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
+"PO-Revision-Date: 2012-11-06 16:03-0300\n"
+"Last-Translator: Tails Developers <amnesia@boum.org>\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
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually Installing onto a USB Stick\"]]\n"
+msgid "[[!meta title=\"Manually installing onto a USB Stick or SD card\"]]\n"
+msgstr "[[!meta title=\"Instalação manual em um dispositivo USB\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.pt\" raw=\"yes\"]]\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Instructions for Linux|first_steps/installation/manual/linux]]"
+msgid ""
+"[[Manual installation using Linux|first_steps/installation/manual/linux]]"
+msgstr "[[Instruções para Linux|first_steps/installation/manual/linux]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Instructions for Windows|first_steps/installation/manual/windows]]"
+msgid ""
+"[[Manual installation using Windows|first_steps/installation/manual/windows]]"
+msgstr ""
+"[[Instruções para Windows|first_steps/installation/manual/windows]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Instructions for Mac|first_steps/installation/manual/mac]]"
+msgid "[[Manual installation using Mac|first_steps/installation/manual/mac]]"
+msgstr "[[Instruções para Mac|first_steps/installation/manual/mac]]"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux.de.po b/wiki/src/doc/first_steps/installation/manual/linux.de.po
index 048ca8a..76b5d59 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Manual installation using Linux\"]]\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Find out the device name of the device</h2>\n"
msgstr ""
#. type: Plain text
@@ -72,7 +72,9 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Unplug the USB stick."
+msgid ""
+"Make sure that the USB stick or SD card onto which you want to install Tails "
+"is unplugged."
msgstr ""
#. type: Plain text
@@ -84,12 +86,27 @@ msgid ""
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
-" 1. <span class=\"application\">Disk Utility</span> lists all the current storage devices on the\n"
-" left side of the screen.\n"
-" 1. Plug back the USB stick. A new device should appear in the list of\n"
-" storage devices. Select it with the cursor.\n"
-" 1. Check that the description of the device corresponds to your USB\n"
-" stick, its brand, its size, etc. on the right side of the screen.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage devices in the left pane of the window."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Plug the USB stick or SD card onto which you want to install Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " A new device appears in the list of storage devices. Click on it.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
msgstr ""
#. type: Plain text
@@ -177,8 +194,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you don't see any error message, Tails is being copied onto the USB "
-"stick. The whole process might take some time, generally a few minutes."
+"If you don't see any error message, Tails is being copied onto the device. "
+"The whole process might take some time, generally a few minutes."
msgstr ""
#. type: Plain text
@@ -190,7 +207,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>Once the command prompt reappears, you can shutdown your computer, and\n"
-"[[start Tails|/download/#start]] from this new USB stick.</p>\n"
+"[[start Tails|/download/#start]] from this new device.</p>\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux.es.po b/wiki/src/doc/first_steps/installation/manual/linux.es.po
index 048ca8a..76b5d59 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux.es.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Manual installation using Linux\"]]\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Find out the device name of the device</h2>\n"
msgstr ""
#. type: Plain text
@@ -72,7 +72,9 @@ msgid ""
msgstr ""
#. type: Bullet: ' 1. '
-msgid "Unplug the USB stick."
+msgid ""
+"Make sure that the USB stick or SD card onto which you want to install Tails "
+"is unplugged."
msgstr ""
#. type: Plain text
@@ -84,12 +86,27 @@ msgid ""
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
-" 1. <span class=\"application\">Disk Utility</span> lists all the current storage devices on the\n"
-" left side of the screen.\n"
-" 1. Plug back the USB stick. A new device should appear in the list of\n"
-" storage devices. Select it with the cursor.\n"
-" 1. Check that the description of the device corresponds to your USB\n"
-" stick, its brand, its size, etc. on the right side of the screen.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage devices in the left pane of the window."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Plug the USB stick or SD card onto which you want to install Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " A new device appears in the list of storage devices. Click on it.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
msgstr ""
#. type: Plain text
@@ -177,8 +194,8 @@ msgstr ""
#. type: Plain text
msgid ""
-"If you don't see any error message, Tails is being copied onto the USB "
-"stick. The whole process might take some time, generally a few minutes."
+"If you don't see any error message, Tails is being copied onto the device. "
+"The whole process might take some time, generally a few minutes."
msgstr ""
#. type: Plain text
@@ -190,7 +207,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>Once the command prompt reappears, you can shutdown your computer, and\n"
-"[[start Tails|/download/#start]] from this new USB stick.</p>\n"
+"[[start Tails|/download/#start]] from this new device.</p>\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux.fr.po b/wiki/src/doc/first_steps/installation/manual/linux.fr.po
index d7e50cd..b8dad4a 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSIONx\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2013-08-15 21:11-0000\n"
"Last-Translator: \n"
"Language-Team: GANGUALE <LL@li.org>\n"
@@ -17,14 +17,16 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Manual installation using Linux\"]]\n"
msgstr "[[!meta title=\"Installer manuellement sur une clé USB, depuis Linux\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.fr\" raw=\"yes\"]]\n"
#. type: Plain text
msgid "This technique uses the command line."
@@ -59,8 +61,9 @@ msgid "<a id=\"step_2\"></a>\n"
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Find out the device name of the device</h2>\n"
msgstr "<h2 class=\"bullet-number-two\">Trouver le nom de périphérique de la clé USB</h2>\n"
#. type: Plain text
@@ -78,11 +81,26 @@ msgstr ""
"procédez comme suit :"
#. type: Bullet: ' 1. '
-msgid "Unplug the USB stick."
-msgstr "Débranchez la clé USB."
+msgid ""
+"Make sure that the USB stick or SD card onto which you want to install Tails "
+"is unplugged."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| " </span>\n"
+#| " 1. <span class=\"application\">Disk Utility</span> lists all the current storage devices on the\n"
+#| " left side of the screen.\n"
+#| " 1. Plug back the USB stick. A new device should appear in the list of\n"
+#| " storage devices. Select it with the cursor.\n"
+#| " 1. Check that the description of the device corresponds to your USB\n"
+#| " stick, its brand, its size, etc. on the right side of the screen.\n"
msgid ""
" 1. Open <span class=\"application\">GNOME Disk Utility</span> from the menu\n"
" <span class=\"menuchoice\">\n"
@@ -90,12 +108,6 @@ msgid ""
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
-" 1. <span class=\"application\">Disk Utility</span> lists all the current storage devices on the\n"
-" left side of the screen.\n"
-" 1. Plug back the USB stick. A new device should appear in the list of\n"
-" storage devices. Select it with the cursor.\n"
-" 1. Check that the description of the device corresponds to your USB\n"
-" stick, its brand, its size, etc. on the right side of the screen.\n"
msgstr ""
" 1. Ouvrir l'<span class=\"application\">Utilitaire de Disque GNOME</span> depuis le menu\n"
" <span class=\"menuchoice\">\n"
@@ -110,6 +122,27 @@ msgstr ""
" 1. Vérifiez que la description du périphérique correspond à votre clé USB,\n"
" sa marque, sa taille, etc. dans la partie droite de la fenêtre.\n"
+#. type: Bullet: ' 1. '
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage devices in the left pane of the window."
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Plug the USB stick or SD card onto which you want to install Tails."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " A new device appears in the list of storage devices. Click on it.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid " [[!img destination_device_description.png link=no alt=\"Drive description containing: 'Device: /dev/sdc'\"]]\n"
@@ -130,6 +163,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name, you should stop\n"
"proceeding or <strong>you risk overwriting any hard drive on the\n"
@@ -195,6 +229,7 @@ msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
@@ -211,9 +246,13 @@ msgstr ""
"le terminal. Tapez ensuite le reste de la commande et exécutez-là.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you don't see any error message, Tails is being copied onto the USB "
+#| "stick. The whole process might take some time, generally a few minutes."
msgid ""
-"If you don't see any error message, Tails is being copied onto the USB "
-"stick. The whole process might take some time, generally a few minutes."
+"If you don't see any error message, Tails is being copied onto the device. "
+"The whole process might take some time, generally a few minutes."
msgstr ""
"Si vous ne voyez aucun message d'erreur, Tails est en train d'être copié "
"vers la clé USB. Ce processus peut prendre du temps, généralement quelques "
@@ -225,9 +264,13 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>Once the command prompt reappears, you can shutdown your computer, and\n"
+#| "[[start Tails|/download/#start]] from this new USB stick.</p>\n"
msgid ""
"<p>Once the command prompt reappears, you can shutdown your computer, and\n"
-"[[start Tails|/download/#start]] from this new USB stick.</p>\n"
+"[[start Tails|/download/#start]] from this new device.</p>\n"
msgstr ""
"<p>Lorsque l'invite de commande réapparait, vous pouvez éteindre l'ordinateur, et\n"
"[[démarrer Tails|/download/#start]] depuis cette nouvelle clé USB.</p>\n"
@@ -290,6 +333,9 @@ msgstr ""
"Vous avez probablement fait une erreur concernant le chemin de votre fichier "
"ISO à [[l'étape 3|linux#step_3]] de la seconde méthode."
+#~ msgid "Unplug the USB stick."
+#~ msgstr "Débranchez la clé USB."
+
#~ msgid ""
#~ " sudo su -\n"
#~ " isohybrid [tails.iso] --entry 4 --type 0x1c\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux.mdwn b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
index 0b8f5bc..0b8f5bc 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux.pt.po b/wiki/src/doc/first_steps/installation/manual/linux.pt.po
index 111e377..299a7dd 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual/linux.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2013-04-12 12:02+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually installing onto a USB stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Manual installation using Linux\"]]\n"
msgstr "[[!meta title=\"Instalando manualmente em uma memória USB no Linux\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.pt\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.pt\" raw=\"yes\"]]\n"
#. type: Plain text
msgid "This technique uses the command line."
@@ -62,8 +64,9 @@ msgid "<a id=\"step_2\"></a>\n"
msgstr "<a id=\"step_2\"></a>\n"
#. type: Plain text
-#, no-wrap
-msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+#, fuzzy, no-wrap
+#| msgid "<h2 class=\"bullet-number-two\">Find out the device name of the USB stick</h2>\n"
+msgid "<h2 class=\"bullet-number-two\">Find out the device name of the device</h2>\n"
msgstr "<h2 class=\"bullet-number-two\">Descubra o nome do dispositivo da memória USB</h2>\n"
#. type: Plain text
@@ -80,8 +83,10 @@ msgstr ""
"Se você não tem certeza do nome preciso do dispositivo, faça o seguinte."
#. type: Bullet: ' 1. '
-msgid "Unplug the USB stick."
-msgstr "Desconecte a memória USB."
+msgid ""
+"Make sure that the USB stick or SD card onto which you want to install Tails "
+"is unplugged."
+msgstr ""
#. type: Plain text
#, no-wrap
@@ -92,14 +97,42 @@ msgid ""
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
-" 1. <span class=\"application\">Disk Utility</span> lists all the current storage devices on the\n"
-" left side of the screen.\n"
-" 1. Plug back the USB stick. A new device should appear in the list of\n"
-" storage devices. Select it with the cursor.\n"
-" 1. Check that the description of the device corresponds to your USB\n"
-" stick, its brand, its size, etc. on the right side of the screen.\n"
msgstr ""
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "The disk utility will list all the current storage devices on the left "
+#| "side of the screen:"
+msgid ""
+"<span class=\"application\">Disk Utility</span> lists all the current "
+"storage devices in the left pane of the window."
+msgstr ""
+"O utilitário de disco vai listar todos os dispositivos de armazenamento "
+"atualmente conectados no lado esquerdo da tela:"
+
+#. type: Bullet: ' 1. '
+msgid "Plug the USB stick or SD card onto which you want to install Tails."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Plug back the USB stick. A new device should appear in the list of storage devices. Select it with the cursor:"
+msgid " A new device appears in the list of storage devices. Click on it.\n"
+msgstr "Conecte de volta a memória USB. Um novo dispositivo deve aparecer na lista de dispositivos de armazenamento. Selecione-o com o cursor:"
+
+#. type: Bullet: ' 1. '
+#, fuzzy
+#| msgid ""
+#| "Check that the description of the device corresponds to your USB stick, "
+#| "its brand, its size, etc. on the right side of the screen."
+msgid ""
+"In the right pane of the window, verify that the device corresponds to your "
+"device, its brand, its size, etc."
+msgstr ""
+"Verifique que a descrição do dispositivo corresponde à sua memória USB "
+"(marca, tamanho, etc) no lado direito da tela."
+
#. type: Plain text
#, no-wrap
msgid " [[!img destination_device_description.png link=no alt=\"Drive description containing: 'Device: /dev/sdc'\"]]\n"
@@ -121,6 +154,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name, you should stop\n"
"proceeding or <strong>you risk overwriting any hard drive on the\n"
@@ -197,6 +231,7 @@ msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
@@ -208,9 +243,13 @@ msgid ""
msgstr "Se você não tem certeza do caminho para a imagem ISO ou se você obtiver um erro <span class=\"guilabel\">Arquivo ou diretório não encontrado</span>, você pode primeiro escrever <code>cat</code>, seguido de um espaço, e então arrastar o ícone da imagem ISO de um navegador de arquivos e soltar no terminal. Isto deve inserir o caminho correto para a imagem ISO no terminal. Então, complete o comando.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you don't see any error message, Tails is being copied onto the USB "
+#| "stick. The whole process might take some time, generally a few minutes."
msgid ""
-"If you don't see any error message, Tails is being copied onto the USB "
-"stick. The whole process might take some time, generally a few minutes."
+"If you don't see any error message, Tails is being copied onto the device. "
+"The whole process might take some time, generally a few minutes."
msgstr ""
"Se você não vir nenhuma mensagem de erro, então o Tails está sendo cpiado "
"para a chave. O processo completo pode demorar algum tempo, geralmente "
@@ -222,9 +261,13 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p>Once the command prompt reappears, you can shutdown your computer, and\n"
+#| "[[start Tails|/download/#start]] from this new USB stick.</p>\n"
msgid ""
"<p>Once the command prompt reappears, you can shutdown your computer, and\n"
-"[[start Tails|/download/#start]] from this new USB stick.</p>\n"
+"[[start Tails|/download/#start]] from this new device.</p>\n"
msgstr ""
"<p>Depois que o comando terminar e retornar para o prompt de comando,\n"
"você poderá [[iniciar o Tails|/download/#start]] a partir desta nova memória USB.</p>\n"
@@ -290,6 +333,9 @@ msgstr ""
"Neste caso você com certeza cometeu um erro no caminho para a imagem ISO no "
"[[passo 3|linux#step_3]]."
+#~ msgid "Unplug the USB stick."
+#~ msgstr "Desconecte a memória USB."
+
#~ msgid ""
#~ " sudo su -\n"
#~ " isohybrid [tails.iso] --entry 4 --type 0x1c\n"
@@ -314,13 +360,6 @@ msgstr ""
#~ "Sistema → Utilitário de Disco\"]]\n"
#~ msgid ""
-#~ "The disk utility will list all the current storage devices on the left "
-#~ "side of the screen:"
-#~ msgstr ""
-#~ "O utilitário de disco vai listar todos os dispositivos de armazenamento "
-#~ "atualmente conectados no lado esquerdo da tela:"
-
-#~ msgid ""
#~ "[[!img storage_devices.png link=no alt=\"Storage devices, including USB "
#~ "peripherals\"]]\n"
#~ msgstr ""
@@ -328,26 +367,12 @@ msgstr ""
#~ "incluíndo periféricos USB\"]]\n"
#~ msgid ""
-#~ "Plug back the USB stick. A new device should appear in the list of "
-#~ "storage devices. Select it with the cursor:"
-#~ msgstr ""
-#~ "Conecte de volta a memória USB. Um novo dispositivo deve aparecer na "
-#~ "lista de dispositivos de armazenamento. Selecione-o com o cursor:"
-
-#~ msgid ""
#~ "[[!img destination_device.png link=no alt=\"A new storage device appeared "
#~ "at the end of the list\"]]\n"
#~ msgstr ""
#~ "[[!img destination_device.png link=no alt=\"Um novo dispositivo de "
#~ "armazenamento apareceu ao final da lista\"]]\n"
-#~ msgid ""
-#~ "Check that the description of the device corresponds to your USB stick, "
-#~ "its brand, its size, etc. on the right side of the screen."
-#~ msgstr ""
-#~ "Verifique que a descrição do dispositivo corresponde à sua memória USB "
-#~ "(marca, tamanho, etc) no lado direito da tela."
-
#~ msgid "You should get something like this:"
#~ msgstr "Você deve terminar com algo assim:"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.fr.png b/wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.fr.png
index 6ddaf32..6ddaf32 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.fr.png
+++ b/wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.fr.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.png b/wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.png
index c755647..c755647 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/linux/destination_device_description.png
+++ b/wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/mac.de.po b/wiki/src/doc/first_steps/installation/manual/mac.de.po
index 394ac4b..96bf333 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/mac.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Mac\"]]\n"
+msgid "[[!meta title=\"Manual installation using Mac\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/mac.es.po b/wiki/src/doc/first_steps/installation/manual/mac.es.po
index 394ac4b..96bf333 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/mac.es.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Mac\"]]\n"
+msgid "[[!meta title=\"Manual installation using Mac\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/mac.fr.po b/wiki/src/doc/first_steps/installation/manual/mac.fr.po
index b76c306..a37c966 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/mac.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2013-09-05 19:25-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,16 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Mac\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually installing onto a USB stick, for Mac\"]]\n"
+msgid "[[!meta title=\"Manual installation using Mac\"]]\n"
msgstr "[[!meta title=\"Installer manuellement sur une clé USB, depuis Mac\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.fr\" raw=\"yes\"]]\n"
#. type: Plain text
msgid "This technique uses the command line."
@@ -63,6 +65,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"rEFInd will replace your original bootloader.<br/>\n"
"<strong>This could cause your Mac to not boot.</strong> It is recommended to create a full backup and know how to\n"
@@ -217,6 +220,7 @@ msgstr ""
"disk1`. La vôtre est probablement différente."
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the device name you should stop proceeding or\n"
"<strong>you risk overwriting any hard drive on the system</strong>.\n"
@@ -322,6 +326,7 @@ msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"If you are not sure about the path to the ISO image or if you get a\n"
"<span class=\"guilabel\">No such\n"
@@ -385,6 +390,7 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<p>Once the command prompt reappears, you can restart your Mac.\n"
"Wait for the rEFInd menu and select the USB stick to\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/mac.mdwn b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
index 0284cbb..0284cbb 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/mac.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/mac.pt.po b/wiki/src/doc/first_steps/installation/manual/mac.pt.po
index 394ac4b..96bf333 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/mac.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Mac\"]]\n"
+msgid "[[!meta title=\"Manual installation using Mac\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows.de.po b/wiki/src/doc/first_steps/installation/manual/windows.de.po
index a5de081..e810a7a 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/windows.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Manual installation using Windows\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows.es.po b/wiki/src/doc/first_steps/installation/manual/windows.es.po
index 1411c42..25ffc6a 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows.es.po
+++ b/wiki/src/doc/first_steps/installation/manual/windows.es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-03-04 01:09-0600\n"
"Last-Translator: Alfredo Rubio <alfrb76@hotmail.com>\n"
"Language-Team: SPANISH <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Installing onto a USB stick, for Windows\"]]\n"
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Manual installation using Windows\"]]\n"
msgstr "[[!meta title=\"Instalar en una memoria USB, para Windows\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows.fr.po b/wiki/src/doc/first_steps/installation/manual/windows.fr.po
index 7526a51..42c8617 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows.fr.po
+++ b/wiki/src/doc/first_steps/installation/manual/windows.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2013-01-29 14:51-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,16 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Manual installation using Windows\"]]\n"
msgstr "[[!meta title=\"Installer manuellement sur une clé USB, depuis Windows\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.fr\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
@@ -122,6 +124,7 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
"from this new USB stick.</p>\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows.mdwn b/wiki/src/doc/first_steps/installation/manual/windows.mdwn
index 7f999c7..7f999c7 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/windows.mdwn
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows.pt.po b/wiki/src/doc/first_steps/installation/manual/windows.pt.po
index 84e3657..765974d 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows.pt.po
+++ b/wiki/src/doc/first_steps/installation/manual/windows.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-11-06 16:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Manually installing onto a USB stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Manual installation using Windows\"]]\n"
msgstr "[[!meta title=\"Instalando manualmente em uma memória USB no Windows\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.pt\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.pt\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
@@ -122,6 +124,7 @@ msgid "<div class=\"next\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<p>After the installation completes, you can [[start Tails|/download/#start]]\n"
"from this new USB stick.</p>\n"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/01-run.jpg b/wiki/src/doc/first_steps/installation/manual/windows/01-run.jpg
index 81ca910..81ca910 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/01-run.jpg
+++ b/wiki/src/doc/first_steps/installation/manual/windows/01-run.jpg
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/02-run.jpg b/wiki/src/doc/first_steps/installation/manual/windows/02-run.jpg
index 397bf09..397bf09 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/02-run.jpg
+++ b/wiki/src/doc/first_steps/installation/manual/windows/02-run.jpg
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/03-license-agreement.png b/wiki/src/doc/first_steps/installation/manual/windows/03-license-agreement.png
index 3da6fd6..3da6fd6 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/03-license-agreement.png
+++ b/wiki/src/doc/first_steps/installation/manual/windows/03-license-agreement.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/04-select-tails.png b/wiki/src/doc/first_steps/installation/manual/windows/04-select-tails.png
index db94b51..db94b51 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/04-select-tails.png
+++ b/wiki/src/doc/first_steps/installation/manual/windows/04-select-tails.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/05-browse-iso.png b/wiki/src/doc/first_steps/installation/manual/windows/05-browse-iso.png
index 1a725d5..1a725d5 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/05-browse-iso.png
+++ b/wiki/src/doc/first_steps/installation/manual/windows/05-browse-iso.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/06-choose-drive.png b/wiki/src/doc/first_steps/installation/manual/windows/06-choose-drive.png
index 8654478..8654478 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/06-choose-drive.png
+++ b/wiki/src/doc/first_steps/installation/manual/windows/06-choose-drive.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation/windows/07-create.png b/wiki/src/doc/first_steps/installation/manual/windows/07-create.png
index 7d28502..7d28502 100644
--- a/wiki/src/doc/first_steps/manual_usb_installation/windows/07-create.png
+++ b/wiki/src/doc/first_steps/installation/manual/windows/07-create.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.fr.po b/wiki/src/doc/first_steps/manual_usb_installation.fr.po
deleted file mode 100644
index 0fb7b2b..0000000
--- a/wiki/src/doc/first_steps/manual_usb_installation.fr.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-04-17 16:10+0300\n"
-"PO-Revision-Date: 2012-05-11 16:12-0000\n"
-"Last-Translator: amnesia <amnesia@boum.org>\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 title=\"Manually Installing onto a USB Stick\"]]\n"
-msgstr "[[!meta title=\"Installation manuelle sur une clé USB\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.fr\" raw=\"yes\"]]\n"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Linux|first_steps/manual_usb_installation/linux]]"
-msgstr "[[Instructions pour Linux|first_steps/manual_usb_installation/linux]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Instructions for Windows|first_steps/manual_usb_installation/windows]]"
-msgstr ""
-"[[Instructions pour Windows|first_steps/manual_usb_installation/windows]]"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Mac|first_steps/manual_usb_installation/mac]]"
-msgstr "[[Instructions pour un Mac|first_steps/manual_usb_installation/mac]]"
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.mdwn b/wiki/src/doc/first_steps/manual_usb_installation.mdwn
deleted file mode 100644
index 241daba..0000000
--- a/wiki/src/doc/first_steps/manual_usb_installation.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!meta title="Manually installing onto a USB Stick or SD card"]]
-
-[[!inline pages="doc/first_steps/manual_usb_installation.intro" raw="yes"]]
-
- - [[Manual installation using Linux|first_steps/manual_usb_installation/linux]]
- - [[Manual installation using Windows|first_steps/manual_usb_installation/windows]]
- - [[Manual installation using Mac|first_steps/manual_usb_installation/mac]]
diff --git a/wiki/src/doc/first_steps/manual_usb_installation.pt.po b/wiki/src/doc/first_steps/manual_usb_installation.pt.po
deleted file mode 100644
index e3cc92d..0000000
--- a/wiki/src/doc/first_steps/manual_usb_installation.pt.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-04-17 16:10+0300\n"
-"PO-Revision-Date: 2012-11-06 16:03-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\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 title=\"Manually Installing onto a USB Stick\"]]\n"
-msgstr "[[!meta title=\"Instalação manual em um dispositivo USB\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.pt\" raw=\"yes\"]]\n"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Linux|first_steps/manual_usb_installation/linux]]"
-msgstr "[[Instruções para Linux|first_steps/manual_usb_installation/linux]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Instructions for Windows|first_steps/manual_usb_installation/windows]]"
-msgstr ""
-"[[Instruções para Windows|first_steps/manual_usb_installation/windows]]"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Mac|first_steps/manual_usb_installation/mac]]"
-msgstr "[[Instruções para Mac|first_steps/manual_usb_installation/mac]]"
diff --git a/wiki/src/doc/first_steps/persistence/configure.de.po b/wiki/src/doc/first_steps/persistence/configure.de.po
index b01ad00..849e960 100644
--- a/wiki/src/doc/first_steps/persistence/configure.de.po
+++ b/wiki/src/doc/first_steps/persistence/configure.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-16 23:14+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@ msgstr ""
msgid ""
"When run for the first time, or after [[deleting the persistent volume|"
"delete]], the assistant proposes to create a new persistent volume on the "
-"USB stick from which Tails is running."
+"device from which Tails is running."
msgstr ""
#. type: Plain text
@@ -103,10 +103,10 @@ msgstr ""
#, no-wrap
msgid ""
"<strong>If the creation is interrupted before it finishes</strong>, you may not\n"
-"be able to start Tails from this USB stick any more. This can happen if you\n"
-"close the window of the wizard or unplug the USB stick during the creation of\n"
-"the persistent volume. [[Delete|first_steps/usb_reset]] and\n"
-"[[reinstall|first_steps/usb_installation]] Tails to fix this issue.\n"
+"be able to start Tails from this device any more. This can happen if you\n"
+"close the window of the wizard or unplug the USB stick or SD card during the creation of\n"
+"the persistent volume. [[Delete|first_steps/reset]] and\n"
+"[[reinstall|first_steps/installation]] Tails to fix this issue.\n"
msgstr ""
#. type: Title =
@@ -116,7 +116,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"When run from a USB stick that already has a persistent volume, the "
+"When run from a Tails device that already has a persistent volume, the "
"assistant shows a list of the possible persistent features. Each feature "
"corresponds to a set a files to be saved in the persistent volume."
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/configure.es.po b/wiki/src/doc/first_steps/persistence/configure.es.po
index b01ad00..849e960 100644
--- a/wiki/src/doc/first_steps/persistence/configure.es.po
+++ b/wiki/src/doc/first_steps/persistence/configure.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-16 23:14+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@ msgstr ""
msgid ""
"When run for the first time, or after [[deleting the persistent volume|"
"delete]], the assistant proposes to create a new persistent volume on the "
-"USB stick from which Tails is running."
+"device from which Tails is running."
msgstr ""
#. type: Plain text
@@ -103,10 +103,10 @@ msgstr ""
#, no-wrap
msgid ""
"<strong>If the creation is interrupted before it finishes</strong>, you may not\n"
-"be able to start Tails from this USB stick any more. This can happen if you\n"
-"close the window of the wizard or unplug the USB stick during the creation of\n"
-"the persistent volume. [[Delete|first_steps/usb_reset]] and\n"
-"[[reinstall|first_steps/usb_installation]] Tails to fix this issue.\n"
+"be able to start Tails from this device any more. This can happen if you\n"
+"close the window of the wizard or unplug the USB stick or SD card during the creation of\n"
+"the persistent volume. [[Delete|first_steps/reset]] and\n"
+"[[reinstall|first_steps/installation]] Tails to fix this issue.\n"
msgstr ""
#. type: Title =
@@ -116,7 +116,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"When run from a USB stick that already has a persistent volume, the "
+"When run from a Tails device that already has a persistent volume, the "
"assistant shows a list of the possible persistent features. Each feature "
"corresponds to a set a files to be saved in the persistent volume."
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index 1a9c036..b8fa3eb 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-16 23:14+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -80,10 +80,15 @@ msgid "Creating the Persistent Volume\n"
msgstr "Créer le volume persistant\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "When run for the first time, or after [[deleting the persistent volume|"
+#| "delete]], the assistant proposes to create a new persistent volume on the "
+#| "USB stick from which Tails is running."
msgid ""
"When run for the first time, or after [[deleting the persistent volume|"
"delete]], the assistant proposes to create a new persistent volume on the "
-"USB stick from which Tails is running."
+"device from which Tails is running."
msgstr ""
"Lorsque vous lancez l'assistant pour la première fois, ou après avoir "
"[[effacé le volume persistant|delete]], l'assistant vous propose de créer un "
@@ -116,20 +121,26 @@ msgid "<div class=\"bug\">\n"
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<strong>If the creation is interrupted before it finishes</strong>, you may not\n"
+#| "be able to start Tails from this USB stick any more. This can happen if you\n"
+#| "close the window of the wizard or unplug the USB stick during the creation of\n"
+#| "the persistent volume. [[Delete|first_steps/reset]] and\n"
+#| "[[reinstall|first_steps/installation]] Tails to fix this issue.\n"
msgid ""
"<strong>If the creation is interrupted before it finishes</strong>, you may not\n"
-"be able to start Tails from this USB stick any more. This can happen if you\n"
-"close the window of the wizard or unplug the USB stick during the creation of\n"
-"the persistent volume. [[Delete|first_steps/usb_reset]] and\n"
-"[[reinstall|first_steps/usb_installation]] Tails to fix this issue.\n"
+"be able to start Tails from this device any more. This can happen if you\n"
+"close the window of the wizard or unplug the USB stick or SD card during the creation of\n"
+"the persistent volume. [[Delete|first_steps/reset]] and\n"
+"[[reinstall|first_steps/installation]] Tails to fix this issue.\n"
msgstr ""
"<strong>Si l'opération est interrompue avant la fin</strong>, vous pourriez ne plus\n"
"pouvoir démarrer Tails à partir de cette clé USB. Cela peut se produire si vous fermez\n"
" la fenêtre de l'assistant ou débranchez la clé USB pendant la création du volume\n"
"persistant. Pour résoudre ce problème, vous devez\n"
-"[[supprimer|first_steps/usb_reset]] et\n"
-"[[réinstaller|first_steps/usb_installation]] Tails.\n"
+"[[supprimer|first_steps/reset]] et\n"
+"[[réinstaller|first_steps/installation]] Tails.\n"
#. type: Title =
#, no-wrap
@@ -137,8 +148,13 @@ msgid "Persistent Volume Features\n"
msgstr "Options du volume persistant\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "When run from a USB stick that already has a persistent volume, the "
+#| "assistant shows a list of the possible persistent features. Each feature "
+#| "corresponds to a set a files to be saved in the persistent volume."
msgid ""
-"When run from a USB stick that already has a persistent volume, the "
+"When run from a Tails device that already has a persistent volume, the "
"assistant shows a list of the possible persistent features. Each feature "
"corresponds to a set a files to be saved in the persistent volume."
msgstr ""
@@ -162,10 +178,9 @@ msgid ""
"after restarting Tails but the corresponding files will remain on the "
"persistent volume."
msgstr ""
-"Si vous désactivez une option qui était auparavant activée,"
-"elle sera désactivée après avoir redémarré Tails, mais les"
-"fichiers correspondants seront conservés sur le volume"
-"persistant."
+"Si vous désactivez une option qui était auparavant activée,elle sera "
+"désactivée après avoir redémarré Tails, mais lesfichiers correspondants "
+"seront conservés sur le volumepersistant."
#. type: Plain text
#, no-wrap
@@ -793,11 +808,9 @@ msgid ""
"connect Tails to Internet with persistence activated."
msgstr ""
"Si vous êtes hors ligne et que vos logiciels additionnels ne s'installent "
-"pas,"
-"cela peut être causé par des listes APT qui ne sont pas à jour. Ce problème "
-"sera"
-"réglé la prochaine fois que vous connecterez Tails à Internet avec la "
-"persistance activée."
+"pas,cela peut être causé par des listes APT qui ne sont pas à jour. Ce "
+"problème seraréglé la prochaine fois que vous connecterez Tails à Internet "
+"avec la persistance activée."
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps/persistence/configure.mdwn b/wiki/src/doc/first_steps/persistence/configure.mdwn
index 04c645c..7d9e625 100644
--- a/wiki/src/doc/first_steps/persistence/configure.mdwn
+++ b/wiki/src/doc/first_steps/persistence/configure.mdwn
@@ -43,8 +43,8 @@ Passphrase</span> text boxes.
<strong>If the creation is interrupted before it finishes</strong>, you may not
be able to start Tails from this device any more. This can happen if you
close the window of the wizard or unplug the USB stick or SD card during the creation of
-the persistent volume. [[Delete|first_steps/usb_reset]] and
-[[reinstall|first_steps/usb_installation]] Tails to fix this issue.
+the persistent volume. [[Delete|first_steps/reset]] and
+[[reinstall|first_steps/installation]] Tails to fix this issue.
</div>
diff --git a/wiki/src/doc/first_steps/persistence/configure.pt.po b/wiki/src/doc/first_steps/persistence/configure.pt.po
index f3bb020..ff7ca8d 100644
--- a/wiki/src/doc/first_steps/persistence/configure.pt.po
+++ b/wiki/src/doc/first_steps/persistence/configure.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-16 23:14+0300\n"
+"POT-Creation-Date: 2013-10-24 02:10+0300\n"
"PO-Revision-Date: 2012-11-06 16:19-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,7 +78,7 @@ msgstr ""
msgid ""
"When run for the first time, or after [[deleting the persistent volume|"
"delete]], the assistant proposes to create a new persistent volume on the "
-"USB stick from which Tails is running."
+"device from which Tails is running."
msgstr ""
#. type: Plain text
@@ -107,10 +107,10 @@ msgstr ""
#, no-wrap
msgid ""
"<strong>If the creation is interrupted before it finishes</strong>, you may not\n"
-"be able to start Tails from this USB stick any more. This can happen if you\n"
-"close the window of the wizard or unplug the USB stick during the creation of\n"
-"the persistent volume. [[Delete|first_steps/usb_reset]] and\n"
-"[[reinstall|first_steps/usb_installation]] Tails to fix this issue.\n"
+"be able to start Tails from this device any more. This can happen if you\n"
+"close the window of the wizard or unplug the USB stick or SD card during the creation of\n"
+"the persistent volume. [[Delete|first_steps/reset]] and\n"
+"[[reinstall|first_steps/installation]] Tails to fix this issue.\n"
msgstr ""
#. type: Title =
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"When run from a USB stick that already has a persistent volume, the "
+"When run from a Tails device that already has a persistent volume, the "
"assistant shows a list of the possible persistent features. Each feature "
"corresponds to a set a files to be saved in the persistent volume."
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/delete.de.po b/wiki/src/doc/first_steps/persistence/delete.de.po
index 9ec990d..63f1178 100644
--- a/wiki/src/doc/first_steps/persistence/delete.de.po
+++ b/wiki/src/doc/first_steps/persistence/delete.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To delete the persistent volume of a USB stick, choose\n"
+"To delete the persistent volume of a Tails device, choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
@@ -41,7 +41,7 @@ msgstr ""
msgid ""
"This can be useful in order to delete all the files saved to the persistent "
"volume in a single operation. You can later create a new persistent volume "
-"on the same USB stick without having to reinstall Tails."
+"on the same device without having to reinstall Tails."
msgstr ""
#. type: Plain text
@@ -56,7 +56,7 @@ msgid ""
"old persistent volume using [[data\n"
"recovery techniques|encryption_and_privacy/secure_deletion#why]].</strong>\n"
"For more security, start Tails from another media, and do the following\n"
-"operations on the USB stick that you want to delete securely:\n"
+"operations on the device that you want to delete securely:\n"
msgstr ""
#. type: Plain text
@@ -64,13 +64,13 @@ msgstr ""
msgid ""
"<ol>\n"
"<li>[[Create an encrypted partition|encryption_and_privacy/encrypted_volumes]]\n"
-"on the whole USB stick. This step deletes both Tails and the persistent volume\n"
-"from the USB stick.</li>\n"
+"on the whole device. This step deletes both Tails and the persistent volume\n"
+"from the device.</li>\n"
"<li>[[Securely clean all the available disk\n"
"space|encryption_and_privacy/secure_deletion#clean_disk_space]] on this new encrypted\n"
"partition.</li>\n"
-"<li>[[Reinstall Tails|usb_installation]] on the USB stick.</li>\n"
-"<li>Start Tails from the USB stick and [[create a new persistent\n"
+"<li>[[Reinstall Tails|usb_installation]] on the device.</li>\n"
+"<li>Start Tails from the device and [[create a new persistent\n"
"volume|persistence/configure]].</li>\n"
"</ol>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/delete.es.po b/wiki/src/doc/first_steps/persistence/delete.es.po
index 9ec990d..63f1178 100644
--- a/wiki/src/doc/first_steps/persistence/delete.es.po
+++ b/wiki/src/doc/first_steps/persistence/delete.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To delete the persistent volume of a USB stick, choose\n"
+"To delete the persistent volume of a Tails device, choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
@@ -41,7 +41,7 @@ msgstr ""
msgid ""
"This can be useful in order to delete all the files saved to the persistent "
"volume in a single operation. You can later create a new persistent volume "
-"on the same USB stick without having to reinstall Tails."
+"on the same device without having to reinstall Tails."
msgstr ""
#. type: Plain text
@@ -56,7 +56,7 @@ msgid ""
"old persistent volume using [[data\n"
"recovery techniques|encryption_and_privacy/secure_deletion#why]].</strong>\n"
"For more security, start Tails from another media, and do the following\n"
-"operations on the USB stick that you want to delete securely:\n"
+"operations on the device that you want to delete securely:\n"
msgstr ""
#. type: Plain text
@@ -64,13 +64,13 @@ msgstr ""
msgid ""
"<ol>\n"
"<li>[[Create an encrypted partition|encryption_and_privacy/encrypted_volumes]]\n"
-"on the whole USB stick. This step deletes both Tails and the persistent volume\n"
-"from the USB stick.</li>\n"
+"on the whole device. This step deletes both Tails and the persistent volume\n"
+"from the device.</li>\n"
"<li>[[Securely clean all the available disk\n"
"space|encryption_and_privacy/secure_deletion#clean_disk_space]] on this new encrypted\n"
"partition.</li>\n"
-"<li>[[Reinstall Tails|usb_installation]] on the USB stick.</li>\n"
-"<li>Start Tails from the USB stick and [[create a new persistent\n"
+"<li>[[Reinstall Tails|usb_installation]] on the device.</li>\n"
+"<li>Start Tails from the device and [[create a new persistent\n"
"volume|persistence/configure]].</li>\n"
"</ol>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/delete.fr.po b/wiki/src/doc/first_steps/persistence/delete.fr.po
index 1491b0f..dbd8918 100644
--- a/wiki/src/doc/first_steps/persistence/delete.fr.po
+++ b/wiki/src/doc/first_steps/persistence/delete.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2013-02-26 14:51-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
@@ -27,9 +27,16 @@ msgid "[[!inline pages=\"doc/first_steps/persistence.caution\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To delete the persistent volume of a USB stick, choose\n"
+#| "<span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">Delete persistent storage</span></span>, and click\n"
+#| " on the <span class=\"guilabel\">Delete</span> button.\n"
msgid ""
-"To delete the persistent volume of a USB stick, choose\n"
+"To delete the persistent volume of a Tails device, choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
@@ -44,10 +51,15 @@ msgstr ""
" sur le bouton <span class=\"guilabel\">Supprimer</span>.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This can be useful in order to delete all the files saved to the "
+#| "persistent volume in a single operation. You can later create a new "
+#| "persistent volume on the same USB stick without having to reinstall Tails."
msgid ""
"This can be useful in order to delete all the files saved to the persistent "
"volume in a single operation. You can later create a new persistent volume "
-"on the same USB stick without having to reinstall Tails."
+"on the same device without having to reinstall Tails."
msgstr ""
"Cela peut être utilisé pour supprimer en une seule opération tous les "
"fichiers sauvegardés sur le volume persistant. Vous pouvez ensuite créer un "
@@ -59,12 +71,19 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<strong>This technique may not prevent an attacker to recover the files of the\n"
+#| "old persistent volume using [[data\n"
+#| "recovery techniques|encryption_and_privacy/secure_deletion#why]].</strong>\n"
+#| "For more security, start Tails from another media, and do the following\n"
+#| "operations on the USB stick that you want to delete securely:\n"
msgid ""
"<strong>This technique may not prevent an attacker to recover the files of the\n"
"old persistent volume using [[data\n"
"recovery techniques|encryption_and_privacy/secure_deletion#why]].</strong>\n"
"For more security, start Tails from another media, and do the following\n"
-"operations on the USB stick that you want to delete securely:\n"
+"operations on the device that you want to delete securely:\n"
msgstr ""
"<strong>Cette technique n'empêche pas un attaquant de [[récupérer les anciennes\n"
"données persistantes|encryption_and_privacy/secure_deletion#why]].</strong> Pour\n"
@@ -72,16 +91,29 @@ msgstr ""
"sur la clé que vous souhaitez effacer de façon sécurisée :\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ol>\n"
+#| "<li>[[Create an encrypted partition|encryption_and_privacy/encrypted_volumes]]\n"
+#| "on the whole USB stick. This step deletes both Tails and the persistent volume\n"
+#| "from the USB stick.</li>\n"
+#| "<li>[[Securely clean all the available disk\n"
+#| "space|encryption_and_privacy/secure_deletion#clean_disk_space]] on this new encrypted\n"
+#| "partition.</li>\n"
+#| "<li>[[Reinstall Tails|installation]] on the USB stick.</li>\n"
+#| "<li>Start Tails from the USB stick and [[create a new persistent\n"
+#| "volume|persistence/configure]].</li>\n"
+#| "</ol>\n"
msgid ""
"<ol>\n"
"<li>[[Create an encrypted partition|encryption_and_privacy/encrypted_volumes]]\n"
-"on the whole USB stick. This step deletes both Tails and the persistent volume\n"
-"from the USB stick.</li>\n"
+"on the whole device. This step deletes both Tails and the persistent volume\n"
+"from the device.</li>\n"
"<li>[[Securely clean all the available disk\n"
"space|encryption_and_privacy/secure_deletion#clean_disk_space]] on this new encrypted\n"
"partition.</li>\n"
-"<li>[[Reinstall Tails|usb_installation]] on the USB stick.</li>\n"
-"<li>Start Tails from the USB stick and [[create a new persistent\n"
+"<li>[[Reinstall Tails|usb_installation]] on the device.</li>\n"
+"<li>Start Tails from the device and [[create a new persistent\n"
"volume|persistence/configure]].</li>\n"
"</ol>\n"
msgstr ""
@@ -92,7 +124,7 @@ msgstr ""
"<li>[[Supprimer de manière sécurisée tout l'espace disque disponible\n"
"|encryption_and_privacy/secure_deletion#clean_disk_space]] sur cette nouvelle partition\n"
"chiffrée.</li>\n"
-"<li>[[Reinstaller Tails|usb_installation]] sur la clé USB.</li>\n"
+"<li>[[Reinstaller Tails|installation]] sur la clé USB.</li>\n"
"<li>Démarrer Tails depuis cette clé USB et [[créer un nouveau\n"
"volume persistant|persistence/configure]].</li>\n"
"</ol>\n"
diff --git a/wiki/src/doc/first_steps/persistence/delete.pt.po b/wiki/src/doc/first_steps/persistence/delete.pt.po
index 9ec990d..63f1178 100644
--- a/wiki/src/doc/first_steps/persistence/delete.pt.po
+++ b/wiki/src/doc/first_steps/persistence/delete.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To delete the persistent volume of a USB stick, choose\n"
+"To delete the persistent volume of a Tails device, choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
@@ -41,7 +41,7 @@ msgstr ""
msgid ""
"This can be useful in order to delete all the files saved to the persistent "
"volume in a single operation. You can later create a new persistent volume "
-"on the same USB stick without having to reinstall Tails."
+"on the same device without having to reinstall Tails."
msgstr ""
#. type: Plain text
@@ -56,7 +56,7 @@ msgid ""
"old persistent volume using [[data\n"
"recovery techniques|encryption_and_privacy/secure_deletion#why]].</strong>\n"
"For more security, start Tails from another media, and do the following\n"
-"operations on the USB stick that you want to delete securely:\n"
+"operations on the device that you want to delete securely:\n"
msgstr ""
#. type: Plain text
@@ -64,13 +64,13 @@ msgstr ""
msgid ""
"<ol>\n"
"<li>[[Create an encrypted partition|encryption_and_privacy/encrypted_volumes]]\n"
-"on the whole USB stick. This step deletes both Tails and the persistent volume\n"
-"from the USB stick.</li>\n"
+"on the whole device. This step deletes both Tails and the persistent volume\n"
+"from the device.</li>\n"
"<li>[[Securely clean all the available disk\n"
"space|encryption_and_privacy/secure_deletion#clean_disk_space]] on this new encrypted\n"
"partition.</li>\n"
-"<li>[[Reinstall Tails|usb_installation]] on the USB stick.</li>\n"
-"<li>Start Tails from the USB stick and [[create a new persistent\n"
+"<li>[[Reinstall Tails|usb_installation]] on the device.</li>\n"
+"<li>Start Tails from the device and [[create a new persistent\n"
"volume|persistence/configure]].</li>\n"
"</ol>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/warnings.de.po b/wiki/src/doc/first_steps/persistence/warnings.de.po
index c2d917f..54b3142 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.de.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-04 17:00+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"**The persistent volume is not hidden.** An attacker in possession of the USB\n"
-"stick can know that there is a persistent volume on it. Take into consideration\n"
+"**The persistent volume is not hidden.** An attacker in possession of\n"
+"the device can know that there is a persistent volume on it. Take into consideration\n"
"that you can be forced or tricked to give out its passphrase.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/warnings.es.po b/wiki/src/doc/first_steps/persistence/warnings.es.po
index c2d917f..54b3142 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.es.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-04 17:00+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"**The persistent volume is not hidden.** An attacker in possession of the USB\n"
-"stick can know that there is a persistent volume on it. Take into consideration\n"
+"**The persistent volume is not hidden.** An attacker in possession of\n"
+"the device can know that there is a persistent volume on it. Take into consideration\n"
"that you can be forced or tricked to give out its passphrase.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/persistence/warnings.fr.po b/wiki/src/doc/first_steps/persistence/warnings.fr.po
index 6201c3f..f07e07a 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.fr.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-09 13:08+0200\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2013-09-04 21:27-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
@@ -37,10 +37,14 @@ msgid "Storing Sensitive Documents\n"
msgstr "Stocker des documents sensibles\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The persistent volume is not hidden.** An attacker in possession of the USB\n"
+#| "stick can know that there is a persistent volume on it. Take into consideration\n"
+#| "that you can be forced or tricked to give out its passphrase.\n"
msgid ""
-"**The persistent volume is not hidden.** An attacker in possession of the USB\n"
-"stick can know that there is a persistent volume on it. Take into consideration\n"
+"**The persistent volume is not hidden.** An attacker in possession of\n"
+"the device can know that there is a persistent volume on it. Take into consideration\n"
"that you can be forced or tricked to give out its passphrase.\n"
msgstr ""
"**Le volume persistant n'est pas caché.** Un attaquant en possession de la clé USB\n"
diff --git a/wiki/src/doc/first_steps/persistence/warnings.pt.po b/wiki/src/doc/first_steps/persistence/warnings.pt.po
index 01adad2..8a65b0bc 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.pt.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-04 17:00+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-11-06 16:13-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,10 +36,14 @@ msgid "Storing Sensitive Documents\n"
msgstr "Armazenando documentos sensíveis\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The persistent volume is not hidden.** An attacker in possession of the USB\n"
+#| "stick can know that there is a persistent volume on it. Take into consideration\n"
+#| "that you can be forced or tricked to give out its passphrase.\n"
msgid ""
-"**The persistent volume is not hidden.** An attacker in possession of the USB\n"
-"stick can know that there is a persistent volume on it. Take into consideration\n"
+"**The persistent volume is not hidden.** An attacker in possession of\n"
+"the device can know that there is a persistent volume on it. Take into consideration\n"
"that you can be forced or tricked to give out its passphrase.\n"
msgstr ""
"**O volume persistente não é oculto.** Um atacante que possua a memória\n"
diff --git a/wiki/src/doc/first_steps/usb_reset.de.po b/wiki/src/doc/first_steps/reset.de.po
index 4a324b0..8203d6a 100644
--- a/wiki/src/doc/first_steps/usb_reset.de.po
+++ b/wiki/src/doc/first_steps/reset.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
@@ -28,10 +28,10 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/"
+"[[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/"
"linux]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Windows|usb_reset/windows]]"
+msgid "[[Instructions for Windows|reset/windows]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_reset.es.po b/wiki/src/doc/first_steps/reset.es.po
index 4a324b0..8203d6a 100644
--- a/wiki/src/doc/first_steps/usb_reset.es.po
+++ b/wiki/src/doc/first_steps/reset.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
@@ -28,10 +28,10 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/"
+"[[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/"
"linux]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Windows|usb_reset/windows]]"
+msgid "[[Instructions for Windows|reset/windows]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_reset.fr.po b/wiki/src/doc/first_steps/reset.fr.po
index 2a2592a..c5a0b2c 100644
--- a/wiki/src/doc/first_steps/usb_reset.fr.po
+++ b/wiki/src/doc/first_steps/reset.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-09-23 11:15-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,23 +16,31 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Désinstaller Tails ou réinitialiser une clé USB\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.fr\" raw=\"yes\"]]\n"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|reset/"
+#| "linux]]"
msgid ""
-"[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/"
+"[[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/"
"linux]]"
msgstr ""
-"[[Instructions pour Linux avec Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/"
+"[[Instructions pour Linux avec Gnome: Ubuntu, Debian, Tails, etc.|reset/"
"linux]]"
#. type: Bullet: ' - '
-msgid "[[Instructions for Windows|usb_reset/windows]]"
-msgstr "[[Instructions pour Windows|usb_reset/windows]]"
+#, fuzzy
+#| msgid "[[Instructions for Windows|reset/windows]]"
+msgid "[[Instructions for Windows|reset/windows]]"
+msgstr "[[Instructions pour Windows|reset/windows]]"
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.de.po b/wiki/src/doc/first_steps/reset.intro.de.po
index 98e3d06..65ff1ed 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.de.po
+++ b/wiki/src/doc/first_steps/reset.intro.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
#. type: Plain text
msgid ""
-"To uninstall Tails from a USB stick, and use it for something else, you have "
-"to reset it."
+"To uninstall Tails from a USB stick or SD card, and use it for something "
+"else, you have to reset it."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"**The content of the USB stick will be lost in the operation,** but an attacker\n"
-"might still be able to tell that Tails was installed on the USB stick using\n"
+"**The content of the device will be lost in the operation,** but an attacker\n"
+"might still be able to tell that Tails was installed on that device using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
"[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
"afterwards.\n"
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.es.po b/wiki/src/doc/first_steps/reset.intro.es.po
index 98e3d06..65ff1ed 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.es.po
+++ b/wiki/src/doc/first_steps/reset.intro.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
#. type: Plain text
msgid ""
-"To uninstall Tails from a USB stick, and use it for something else, you have "
-"to reset it."
+"To uninstall Tails from a USB stick or SD card, and use it for something "
+"else, you have to reset it."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"**The content of the USB stick will be lost in the operation,** but an attacker\n"
-"might still be able to tell that Tails was installed on the USB stick using\n"
+"**The content of the device will be lost in the operation,** but an attacker\n"
+"might still be able to tell that Tails was installed on that device using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
"[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
"afterwards.\n"
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.fr.po b/wiki/src/doc/first_steps/reset.intro.fr.po
index 52ceabe..3b3fa9e 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.fr.po
+++ b/wiki/src/doc/first_steps/reset.intro.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-14 23:24+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-10-04 12:38-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To uninstall Tails from a USB stick, and use it for something else, you "
+#| "have to reset it."
msgid ""
-"To uninstall Tails from a USB stick, and use it for something else, you have "
-"to reset it."
+"To uninstall Tails from a USB stick or SD card, and use it for something "
+"else, you have to reset it."
msgstr ""
"Pour désinstaller Tails d'une clé USB, et l'utiliser pour autre chose, vous "
"devez la réinitialiser."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The content of the USB stick will be lost in the operation,** but an attacker\n"
+#| "might still be able to tell that Tails was installed on the USB stick using\n"
+#| "[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
+#| "[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
+#| "afterwards.\n"
msgid ""
-"**The content of the USB stick will be lost in the operation,** but an attacker\n"
-"might still be able to tell that Tails was installed on the USB stick using\n"
+"**The content of the device will be lost in the operation,** but an attacker\n"
+"might still be able to tell that Tails was installed on that device using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
"[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
"afterwards.\n"
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.mdwn b/wiki/src/doc/first_steps/reset.intro.mdwn
index 3daed46..3daed46 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.mdwn
+++ b/wiki/src/doc/first_steps/reset.intro.mdwn
diff --git a/wiki/src/doc/first_steps/usb_reset.intro.pt.po b/wiki/src/doc/first_steps/reset.intro.pt.po
index 0432daa..cea0fc2 100644
--- a/wiki/src/doc/first_steps/usb_reset.intro.pt.po
+++ b/wiki/src/doc/first_steps/reset.intro.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-06-07 13:33+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-09-28 18:39-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-msgid "To uninstall Tails from a USB stick, and use it for something else, you have to reset it."
-msgstr "Para desinstalar o Tails de uma memória USB e usá-la para alguma otura coisa, você deve resetá-la."
+#, fuzzy
+#| msgid ""
+#| "To uninstall Tails from a USB stick, and use it for something else, you "
+#| "have to reset it."
+msgid ""
+"To uninstall Tails from a USB stick or SD card, and use it for something "
+"else, you have to reset it."
+msgstr ""
+"Para desinstalar o Tails de uma memória USB e usá-la para alguma otura "
+"coisa, você deve resetá-la."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The content of the USB stick will be lost in the operation,** but an attacker\n"
+#| "might still be able to tell that Tails was installed on the USB stick using\n"
+#| "[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
+#| "[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
+#| "afterwards.\n"
msgid ""
-"**The content of the USB stick will be lost in the operation,** but an attacker\n"
-"might still be able to tell that Tails was installed on the USB stick using\n"
+"**The content of the device will be lost in the operation,** but an attacker\n"
+"might still be able to tell that Tails was installed on that device using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]] unless you\n"
"[[securely clean all the available disk space|encryption_and_privacy/secure_deletion#usb_and_ssd]]\n"
"afterwards.\n"
@@ -32,4 +46,3 @@ msgstr ""
"ainda poderá saber que o Tails esteve instalado nesta memória USB usando\n"
"[[técnicas de recuperação de dados|encryption_and_privacy/secure_deletion]], a menos que\n"
"em seguida você [[limpe de forma segura todo o espaço do disco|encryption_and_privacy/secure_deletion#usb_and_ssd]].\n"
-
diff --git a/wiki/src/doc/first_steps/usb_reset.mdwn b/wiki/src/doc/first_steps/reset.mdwn
index e35378a..80e1fbd 100644
--- a/wiki/src/doc/first_steps/usb_reset.mdwn
+++ b/wiki/src/doc/first_steps/reset.mdwn
@@ -2,5 +2,5 @@
[[!inline pages="doc/first_steps/usb_reset.intro" raw="yes"]]
- - [[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|usb_reset/linux]]
- - [[Instructions for Windows|usb_reset/windows]]
+ - [[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/linux]]
+ - [[Instructions for Windows|reset/windows]]
diff --git a/wiki/src/doc/first_steps/reset.pt.po b/wiki/src/doc/first_steps/reset.pt.po
new file mode 100644
index 0000000..0deda68
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset.pt.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
+"PO-Revision-Date: 2012-11-06 16:05-0300\n"
+"Last-Translator: Tails Developers <amnesia@boum.org>\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
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
+msgid "[[!meta title=\"Uninstalling Tails or resetting a USB Stick or SD card\"]]\n"
+msgstr "[[!meta title=\"Desinstalando o Tails ou resetando a memória USB\"]]\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.pt\" raw=\"yes\"]]\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|reset/"
+#| "linux]]"
+msgid ""
+"[[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/"
+"linux]]"
+msgstr ""
+"[[Instruções para Linux com Gnome: Ubuntu, Debian, Tails, etc.|reset/linux]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Instructions for Windows|reset/windows]]"
+msgid "[[Instructions for Windows|reset/windows]]"
+msgstr "[[Instruções para Windows|reset/windows]]"
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.de.po b/wiki/src/doc/first_steps/reset/linux.de.po
index f1d2a9d..47fca54 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.de.po
+++ b/wiki/src/doc/first_steps/reset/linux.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Linux\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,7 +59,8 @@ msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
#. type: Plain text
@@ -82,21 +83,20 @@ msgid ""
msgstr ""
#. type: Bullet: '3. '
-msgid "Plug the USB stick that you want to reset."
+msgid "Plug the USB stick or SD card that you want to reset."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device appears in the list of storage devices in the left pane of the\n"
-" window. This new device corresponds to the USB stick that you plugged in.\n"
-" Click on it.\n"
+" A new device appears in the list of storage devices. This new device\n"
+" corresponds to the USB stick or SD card that you plugged in. Click on it.\n"
msgstr ""
#. type: Bullet: '4. '
msgid ""
"In the right pane of the window, verify that the device corresponds to the "
-"USB stick that you want to reset, its brand, its size, etc."
+"device that you want to reset, its brand, its size, etc."
msgstr ""
#. type: Bullet: '5. '
@@ -120,19 +120,19 @@ msgstr ""
#. type: Bullet: '8. '
msgid ""
-"To make sure that all the changes are written to the USB stick, click on the "
+"To make sure that all the changes are written to the device, click on the "
"<span class=\"button\">Safe Removal</span> button in the right pane."
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Resetting a Tails USB stick from itself\n"
+msgid "Resetting a Tails device from itself\n"
msgstr ""
#. type: Plain text
msgid ""
"If Tails is your only Linux system, you can generally reset a Tails USB "
-"stick directly from that USB stick running Tails."
+"stick or SD card directly from that device while running Tails."
msgstr ""
#. type: Bullet: '1. '
@@ -146,7 +146,7 @@ msgstr ""
#. type: Bullet: '2. '
msgid ""
"If Tails starts as usual, follow the instructions for [[resetting a USB "
-"stick using <span class=\"application\">Disk Utility</span>|"
+"stick or SD card using <span class=\"application\">Disk Utility</span>|"
"linux#disk_utility]]."
msgstr ""
@@ -155,5 +155,5 @@ msgstr ""
msgid ""
" **If the system fails to start**, that means that the computer does not have\n"
" enough memory for this operation mode. Try with another computer, or find\n"
-" another Linux system, such as another Tails USB stick, to do the reset from.\n"
+" another Linux system, such as another Tails device, to do the reset from.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.es.po b/wiki/src/doc/first_steps/reset/linux.es.po
index f1d2a9d..47fca54 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.es.po
+++ b/wiki/src/doc/first_steps/reset/linux.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Linux\"]]\n"
msgstr ""
#. type: Plain text
@@ -59,7 +59,8 @@ msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
#. type: Plain text
@@ -82,21 +83,20 @@ msgid ""
msgstr ""
#. type: Bullet: '3. '
-msgid "Plug the USB stick that you want to reset."
+msgid "Plug the USB stick or SD card that you want to reset."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device appears in the list of storage devices in the left pane of the\n"
-" window. This new device corresponds to the USB stick that you plugged in.\n"
-" Click on it.\n"
+" A new device appears in the list of storage devices. This new device\n"
+" corresponds to the USB stick or SD card that you plugged in. Click on it.\n"
msgstr ""
#. type: Bullet: '4. '
msgid ""
"In the right pane of the window, verify that the device corresponds to the "
-"USB stick that you want to reset, its brand, its size, etc."
+"device that you want to reset, its brand, its size, etc."
msgstr ""
#. type: Bullet: '5. '
@@ -120,19 +120,19 @@ msgstr ""
#. type: Bullet: '8. '
msgid ""
-"To make sure that all the changes are written to the USB stick, click on the "
+"To make sure that all the changes are written to the device, click on the "
"<span class=\"button\">Safe Removal</span> button in the right pane."
msgstr ""
#. type: Title =
#, no-wrap
-msgid "Resetting a Tails USB stick from itself\n"
+msgid "Resetting a Tails device from itself\n"
msgstr ""
#. type: Plain text
msgid ""
"If Tails is your only Linux system, you can generally reset a Tails USB "
-"stick directly from that USB stick running Tails."
+"stick or SD card directly from that device while running Tails."
msgstr ""
#. type: Bullet: '1. '
@@ -146,7 +146,7 @@ msgstr ""
#. type: Bullet: '2. '
msgid ""
"If Tails starts as usual, follow the instructions for [[resetting a USB "
-"stick using <span class=\"application\">Disk Utility</span>|"
+"stick or SD card using <span class=\"application\">Disk Utility</span>|"
"linux#disk_utility]]."
msgstr ""
@@ -155,5 +155,5 @@ msgstr ""
msgid ""
" **If the system fails to start**, that means that the computer does not have\n"
" enough memory for this operation mode. Try with another computer, or find\n"
-" another Linux system, such as another Tails USB stick, to do the reset from.\n"
+" another Linux system, such as another Tails device, to do the reset from.\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.fr.po b/wiki/src/doc/first_steps/reset/linux.fr.po
index 8d8e5fe..0f2c5a6 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.fr.po
+++ b/wiki/src/doc/first_steps/reset/linux.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-09-23 13:50-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Linux\"]]\n"
msgstr "[[!meta title=\"Réinitialiser une clé USB, pour Linux\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.fr\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -46,6 +48,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<strong>You might overwrite any hard drive on the computer.</strong> If at some\n"
"point you are not sure about which device to choose, stop proceeding.\n"
@@ -59,7 +62,10 @@ msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+#, fuzzy
+#| msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr "Soyez sûr que la clé USB que vous voulez réinitialiser est débranchée."
#. type: Plain text
@@ -91,24 +97,33 @@ msgstr ""
" gauche de la fenêtre.\n"
#. type: Bullet: '3. '
-msgid "Plug the USB stick that you want to reset."
+#, fuzzy
+#| msgid "Plug the USB stick that you want to reset."
+msgid "Plug the USB stick or SD card that you want to reset."
msgstr "Branchez la clé USB que vous voulez réinitialiser."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device appears in the list of storage devices in the left pane of the\n"
+#| " window. This new device corresponds to the USB stick that you plugged in.\n"
+#| " Click on it.\n"
msgid ""
-" A new device appears in the list of storage devices in the left pane of the\n"
-" window. This new device corresponds to the USB stick that you plugged in.\n"
-" Click on it.\n"
+" A new device appears in the list of storage devices. This new device\n"
+" corresponds to the USB stick or SD card that you plugged in. Click on it.\n"
msgstr ""
" Un nouveau périphérique apparaît alors dans la liste des périphériques\n"
" de stockage dans la partie gauche de la fenêtre. Ce nouveau périphérique\n"
" correspond à la clé USB que vous venez de brancher. Cliquez dessus.\n"
#. type: Bullet: '4. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane of the window, verify that the device corresponds to "
+#| "the USB stick that you want to reset, its brand, its size, etc."
msgid ""
"In the right pane of the window, verify that the device corresponds to the "
-"USB stick that you want to reset, its brand, its size, etc."
+"device that you want to reset, its brand, its size, etc."
msgstr ""
"Dans la partie droite de la fenêtre, vérifiez que le périphérique correspond "
"à la clé USB que vous voulez réinitialiser, sa marque, sa taille, etc."
@@ -141,8 +156,12 @@ msgstr ""
"\"button\">Formater</span> pour confirmer."
#. type: Bullet: '8. '
+#, fuzzy
+#| msgid ""
+#| "To make sure that all the changes are written to the USB stick, click on "
+#| "the <span class=\"button\">Safe Removal</span> button in the right pane."
msgid ""
-"To make sure that all the changes are written to the USB stick, click on the "
+"To make sure that all the changes are written to the device, click on the "
"<span class=\"button\">Safe Removal</span> button in the right pane."
msgstr ""
"Pour être sûr que tous les changements ont été écrit sur la clé USB, cliquez "
@@ -150,14 +169,19 @@ msgstr ""
"dans la partie droite de la fenêtre."
#. type: Title =
-#, no-wrap
-msgid "Resetting a Tails USB stick from itself\n"
+#, fuzzy, no-wrap
+#| msgid "Resetting a Tails USB stick from itself\n"
+msgid "Resetting a Tails device from itself\n"
msgstr "Réinitialiser une clé USB depuis elle-même\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If Tails is your only Linux system, you can generally reset a Tails USB "
+#| "stick directly from that USB stick running Tails."
msgid ""
"If Tails is your only Linux system, you can generally reset a Tails USB "
-"stick directly from that USB stick running Tails."
+"stick or SD card directly from that device while running Tails."
msgstr ""
"Si Tails est votre seul système Linux, vous pouvez généralement "
"réinitialiser une clé USB Tails directement depuis cette clé USB en cours "
@@ -177,9 +201,14 @@ msgstr ""
"startup_options#boot_menu]]."
#. type: Bullet: '2. '
+#, fuzzy
+#| msgid ""
+#| "If Tails starts as usual, follow the instructions for [[resetting a USB "
+#| "stick using <span class=\"application\">Disk Utility</span>|"
+#| "linux#disk_utility]]."
msgid ""
"If Tails starts as usual, follow the instructions for [[resetting a USB "
-"stick using <span class=\"application\">Disk Utility</span>|"
+"stick or SD card using <span class=\"application\">Disk Utility</span>|"
"linux#disk_utility]]."
msgstr ""
"Si Tails démarre comme d'habitude, suivre les instructions pour "
@@ -187,11 +216,15 @@ msgstr ""
"\">l'Utilitaire de disque</span>|linux#disk_utility]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " **If the system fails to start**, that means that the computer does not have\n"
+#| " enough memory for this operation mode. Try with another computer, or find\n"
+#| " another Linux system, such as another Tails USB stick, to do the reset from.\n"
msgid ""
" **If the system fails to start**, that means that the computer does not have\n"
" enough memory for this operation mode. Try with another computer, or find\n"
-" another Linux system, such as another Tails USB stick, to do the reset from.\n"
+" another Linux system, such as another Tails device, to do the reset from.\n"
msgstr ""
" **Si le système n'arrive pas à démarrer**, cela signifie que l'ordinateur n'a\n"
" pas assez de mémoire pour ce mode opératoire. Essayez avec un autre\n"
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.mdwn b/wiki/src/doc/first_steps/reset/linux.mdwn
index 7d444be..7d444be 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.mdwn
+++ b/wiki/src/doc/first_steps/reset/linux.mdwn
diff --git a/wiki/src/doc/first_steps/usb_reset/linux.pt.po b/wiki/src/doc/first_steps/reset/linux.pt.po
index 71a0d42..148af4f 100644
--- a/wiki/src/doc/first_steps/usb_reset/linux.pt.po
+++ b/wiki/src/doc/first_steps/reset/linux.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-11-06 16:06-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Resetting a USB Stick, for Linux\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Linux\"]]\n"
msgstr "[[!meta title=\"Resetando uma memória USB no Linux\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.pt\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.pt\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -46,6 +48,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<strong>You might overwrite any hard drive on the computer.</strong> If at some\n"
"point you are not sure about which device to choose, stop proceeding.\n"
@@ -59,7 +62,10 @@ msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+#, fuzzy
+#| msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
"Tenha certeza de que a memória USB que você quer resetar esteja desconectada."
@@ -92,24 +98,33 @@ msgstr ""
" painel esquedo da janela.\n"
#. type: Bullet: '3. '
-msgid "Plug the USB stick that you want to reset."
+#, fuzzy
+#| msgid "Plug the USB stick that you want to reset."
+msgid "Plug the USB stick or SD card that you want to reset."
msgstr "Conecte a memória USB que você quer resetar."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device appears in the list of storage devices in the left pane of the\n"
+#| " window. This new device corresponds to the USB stick that you plugged in.\n"
+#| " Click on it.\n"
msgid ""
-" A new device appears in the list of storage devices in the left pane of the\n"
-" window. This new device corresponds to the USB stick that you plugged in.\n"
-" Click on it.\n"
+" A new device appears in the list of storage devices. This new device\n"
+" corresponds to the USB stick or SD card that you plugged in. Click on it.\n"
msgstr ""
" Um novo dispositivo aparecerá na lista no painel esquerdo da janela.\n"
" Este novo dispositivo corresponde à memória USB que você acabou de\n"
" conectar. Clique nele.\n"
#. type: Bullet: '4. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane of the window, verify that the device corresponds to "
+#| "the USB stick that you want to reset, its brand, its size, etc."
msgid ""
"In the right pane of the window, verify that the device corresponds to the "
-"USB stick that you want to reset, its brand, its size, etc."
+"device that you want to reset, its brand, its size, etc."
msgstr ""
"No painel à direita da janela, verifique que o dispositivo corresponde à "
"memória USB que você quer resetar (sua marca, tamanho, etc)."
@@ -141,8 +156,12 @@ msgstr ""
"\">Formatar</span> para confirmar."
#. type: Bullet: '8. '
+#, fuzzy
+#| msgid ""
+#| "To make sure that all the changes are written to the USB stick, click on "
+#| "the <span class=\"button\">Safe Removal</span> button in the right pane."
msgid ""
-"To make sure that all the changes are written to the USB stick, click on the "
+"To make sure that all the changes are written to the device, click on the "
"<span class=\"button\">Safe Removal</span> button in the right pane."
msgstr ""
"Para ter certeza de que todas as mudanças serão escritas na memória USB, "
@@ -150,14 +169,19 @@ msgstr ""
"painel à direita."
#. type: Title =
-#, no-wrap
-msgid "Resetting a Tails USB stick from itself\n"
+#, fuzzy, no-wrap
+#| msgid "Resetting a Tails USB stick from itself\n"
+msgid "Resetting a Tails device from itself\n"
msgstr "Resetando uma memória USB com Tails a partir dela própria\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If Tails is your only Linux system, you can generally reset a Tails USB "
+#| "stick directly from that USB stick running Tails."
msgid ""
"If Tails is your only Linux system, you can generally reset a Tails USB "
-"stick directly from that USB stick running Tails."
+"stick or SD card directly from that device while running Tails."
msgstr ""
"Se Tails for seu único sistema Linux, você pode geralmente resetar uma "
"memória com Tails diretamente daquela memória USB rodando o Tails."
@@ -175,9 +199,14 @@ msgstr ""
"\"application\">menu de boot</span>|startup_options#boot_menu]]."
#. type: Bullet: '2. '
+#, fuzzy
+#| msgid ""
+#| "If Tails starts as usual, follow the instructions for [[resetting a USB "
+#| "stick using <span class=\"application\">Disk Utility</span>|"
+#| "linux#disk_utility]]."
msgid ""
"If Tails starts as usual, follow the instructions for [[resetting a USB "
-"stick using <span class=\"application\">Disk Utility</span>|"
+"stick or SD card using <span class=\"application\">Disk Utility</span>|"
"linux#disk_utility]]."
msgstr ""
"Se o Tails for iniciado da forma usual, siga as instruções para [[resetar "
@@ -185,11 +214,15 @@ msgstr ""
"Disco</span>|linux#disk_utility]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " **If the system fails to start**, that means that the computer does not have\n"
+#| " enough memory for this operation mode. Try with another computer, or find\n"
+#| " another Linux system, such as another Tails USB stick, to do the reset from.\n"
msgid ""
" **If the system fails to start**, that means that the computer does not have\n"
" enough memory for this operation mode. Try with another computer, or find\n"
-" another Linux system, such as another Tails USB stick, to do the reset from.\n"
+" another Linux system, such as another Tails device, to do the reset from.\n"
msgstr ""
" ***Se o sistema falhar em iniciar***, isto significa que o computador não possui\n"
" memória suficiente para este modo de operação. Tente com um outro computador, ou\n"
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.de.po b/wiki/src/doc/first_steps/reset/windows.de.po
index 5402546..2e1908e 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.de.po
+++ b/wiki/src/doc/first_steps/reset/windows.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Windows\"]]\n"
msgstr ""
#. type: Plain text
@@ -35,7 +35,7 @@ msgstr ""
#, no-wrap
msgid ""
"<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
-"The version of Diskpart does not list removable disks.\n"
+"The version of <span class=\"application\">Diskpart</span> on Windows XP does not list removable disks.\n"
msgstr ""
#. type: Plain text
@@ -61,7 +61,8 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
#. type: Bullet: '1. '
@@ -112,13 +113,13 @@ msgstr ""
#. type: Bullet: '4. '
msgid ""
-"Plug the USB stick that you want to reset. Run the <span class=\"command"
-"\">list disk</span> command again."
+"Plug the USB stick or SD card that you want to reset. Run the <span class="
+"\"command\">list disk</span> command again."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+msgid " A new disk, which corresponds to that device, appears in the list.\n"
msgstr ""
#. type: Plain text
@@ -138,35 +139,35 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Make sure that its size corresponds to the size of the USB that you want to\n"
+" Make sure that its size corresponds to the size of the device that you want to\n"
" reset. Note down the disk number assigned by <span\n"
-" class=\"application\">Diskpart</span> to the USB stick.\n"
+" class=\"application\">Diskpart</span> to the device.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"To select the USB stick, execute the following command: <span class=\"command"
+"To select the device, execute the following command: <span class=\"command"
"\">select disk=<span class=\"replaceable\">number</span></span>. Replace "
-"<span class=\"replaceable\">number</span> by the disk number of the USB "
-"stick that you want to reset."
+"<span class=\"replaceable\">number</span> by the disk number of the device "
+"that you want to reset."
msgstr ""
#. type: Bullet: '6. '
msgid ""
-"Execute the <span class=\"command\">clean</span> command to remove all "
-"partitioning structures from the USB stick."
+"Execute the <span class=\"command\">clean</span> command to delete the "
+"partition table from the device."
msgstr ""
#. type: Bullet: '7. '
msgid ""
-"Execute the <span class=\"command\">convert mbr</span> command to give the "
-"USB stick a partition table."
+"Execute the <span class=\"command\">convert mbr</span> command to create a "
+"new partition table on the device."
msgstr ""
#. type: Bullet: '8. '
msgid ""
"Execute the <span class=\"command\">create partition primary</span> command "
-"to create a new primary partition on the stick."
+"to create a new primary partition on the device."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.es.po b/wiki/src/doc/first_steps/reset/windows.es.po
index 5402546..2e1908e 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.es.po
+++ b/wiki/src/doc/first_steps/reset/windows.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Windows\"]]\n"
msgstr ""
#. type: Plain text
@@ -35,7 +35,7 @@ msgstr ""
#, no-wrap
msgid ""
"<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
-"The version of Diskpart does not list removable disks.\n"
+"The version of <span class=\"application\">Diskpart</span> on Windows XP does not list removable disks.\n"
msgstr ""
#. type: Plain text
@@ -61,7 +61,8 @@ msgid ""
msgstr ""
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
#. type: Bullet: '1. '
@@ -112,13 +113,13 @@ msgstr ""
#. type: Bullet: '4. '
msgid ""
-"Plug the USB stick that you want to reset. Run the <span class=\"command"
-"\">list disk</span> command again."
+"Plug the USB stick or SD card that you want to reset. Run the <span class="
+"\"command\">list disk</span> command again."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+msgid " A new disk, which corresponds to that device, appears in the list.\n"
msgstr ""
#. type: Plain text
@@ -138,35 +139,35 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Make sure that its size corresponds to the size of the USB that you want to\n"
+" Make sure that its size corresponds to the size of the device that you want to\n"
" reset. Note down the disk number assigned by <span\n"
-" class=\"application\">Diskpart</span> to the USB stick.\n"
+" class=\"application\">Diskpart</span> to the device.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"To select the USB stick, execute the following command: <span class=\"command"
+"To select the device, execute the following command: <span class=\"command"
"\">select disk=<span class=\"replaceable\">number</span></span>. Replace "
-"<span class=\"replaceable\">number</span> by the disk number of the USB "
-"stick that you want to reset."
+"<span class=\"replaceable\">number</span> by the disk number of the device "
+"that you want to reset."
msgstr ""
#. type: Bullet: '6. '
msgid ""
-"Execute the <span class=\"command\">clean</span> command to remove all "
-"partitioning structures from the USB stick."
+"Execute the <span class=\"command\">clean</span> command to delete the "
+"partition table from the device."
msgstr ""
#. type: Bullet: '7. '
msgid ""
-"Execute the <span class=\"command\">convert mbr</span> command to give the "
-"USB stick a partition table."
+"Execute the <span class=\"command\">convert mbr</span> command to create a "
+"new partition table on the device."
msgstr ""
#. type: Bullet: '8. '
msgid ""
"Execute the <span class=\"command\">create partition primary</span> command "
-"to create a new primary partition on the stick."
+"to create a new primary partition on the device."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.fr.po b/wiki/src/doc/first_steps/reset/windows.fr.po
index 0ef3b7e..8977905 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.fr.po
+++ b/wiki/src/doc/first_steps/reset/windows.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-09-23 19:05-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Windows\"]]\n"
msgstr "[[!meta title=\"Réinitialiser une clé USB, pour Windows\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.fr\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.fr\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -31,9 +33,13 @@ msgid "<div class=\"bug\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
+#| "The version of Diskpart does not list removable disks.\n"
msgid ""
"<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
-"The version of Diskpart does not list removable disks.\n"
+"The version of <span class=\"application\">Diskpart</span> on Windows XP does not list removable disks.\n"
msgstr ""
"<strong>Les instructions suivantes ne marchent pas sur Windows XP.</strong><br/>\n"
"La version de Diskpart ne liste pas les périphériques amovibles.\n"
@@ -54,6 +60,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<strong>You might overwrite any hard drive on the computer.</strong><br/>\n"
"If at some point you are not sure about the disk number, stop proceeding.\n"
@@ -62,7 +69,10 @@ msgstr ""
"Si à un moment vous n'êtes pas sûr du choix du périphérique, arrêtez-vous là.\n"
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+#, fuzzy
+#| msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr "Soyez sûr que la clé USB que vous voulez réinitialiser est débranchée."
#. type: Bullet: '1. '
@@ -125,16 +135,21 @@ msgstr ""
" Disk 0 Online 80 GB 0 B\n"
#. type: Bullet: '4. '
+#, fuzzy
+#| msgid ""
+#| "Plug the USB stick that you want to reset. Run the <span class=\"command"
+#| "\">list disk</span> command again."
msgid ""
-"Plug the USB stick that you want to reset. Run the <span class=\"command"
-"\">list disk</span> command again."
+"Plug the USB stick or SD card that you want to reset. Run the <span class="
+"\"command\">list disk</span> command again."
msgstr ""
"Branchez la clé USB que vous voulez réinitialiser. Relancez la commande "
"<span class=\"command\">list disk</span>."
#. type: Plain text
-#, no-wrap
-msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+#, fuzzy, no-wrap
+#| msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+msgid " A new disk, which corresponds to that device, appears in the list.\n"
msgstr " Un nouveau disque, correspondant à la clé USB, apparaît dans la liste.\n"
#. type: Plain text
@@ -156,22 +171,32 @@ msgstr ""
" Disk 1 Online 4 GB 0 B\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Make sure that its size corresponds to the size of the USB that you want to\n"
+#| " reset. Note down the disk number assigned by <span\n"
+#| " class=\"application\">Diskpart</span> to the USB stick.\n"
msgid ""
-" Make sure that its size corresponds to the size of the USB that you want to\n"
+" Make sure that its size corresponds to the size of the device that you want to\n"
" reset. Note down the disk number assigned by <span\n"
-" class=\"application\">Diskpart</span> to the USB stick.\n"
+" class=\"application\">Diskpart</span> to the device.\n"
msgstr ""
" S'assurer que la taille correspond à la taille de la clé USB que vous voulez\n"
" réinitialiser. Noter le numéro de disque assigné par <span\n"
" class=\"application\">Diskpart</span> à la clé USB.\n"
#. type: Bullet: '5. '
-msgid ""
-"To select the USB stick, execute the following command: <span class=\"command"
+#, fuzzy
+#| msgid ""
+#| "To select the USB stick, execute the following command: <span class="
+#| "\"command\">select disk=<span class=\"replaceable\">number</span></"
+#| "span>. Replace <span class=\"replaceable\">number</span> by the disk "
+#| "number of the USB stick that you want to reset."
+msgid ""
+"To select the device, execute the following command: <span class=\"command"
"\">select disk=<span class=\"replaceable\">number</span></span>. Replace "
-"<span class=\"replaceable\">number</span> by the disk number of the USB "
-"stick that you want to reset."
+"<span class=\"replaceable\">number</span> by the disk number of the device "
+"that you want to reset."
msgstr ""
"Pour sélectionner la clé USB, exécutez la commande suivante : <span class="
"\"command\">select disk=<span class=\"replaceable\">number</span></span>. "
@@ -179,25 +204,37 @@ msgstr ""
"de la clé USB que vous voulez réinitialiser."
#. type: Bullet: '6. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">clean</span> command to remove all "
+#| "partitioning structures from the USB stick."
msgid ""
-"Execute the <span class=\"command\">clean</span> command to remove all "
-"partitioning structures from the USB stick."
+"Execute the <span class=\"command\">clean</span> command to delete the "
+"partition table from the device."
msgstr ""
"Exécutez la commande <span class=\"command\">clean</span> pour supprimer "
"toutes les partitions de la clé USB."
#. type: Bullet: '7. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">convert mbr</span> command to give "
+#| "the USB stick a partition table."
msgid ""
-"Execute the <span class=\"command\">convert mbr</span> command to give the "
-"USB stick a partition table."
+"Execute the <span class=\"command\">convert mbr</span> command to create a "
+"new partition table on the device."
msgstr ""
"Exécutez la commande <span class=\"command\">convert mbr</span> pour créer "
"une table des partitions sur la clé USB."
#. type: Bullet: '8. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">create partition primary</span> "
+#| "command to create a new primary partition on the stick."
msgid ""
"Execute the <span class=\"command\">create partition primary</span> command "
-"to create a new primary partition on the stick."
+"to create a new primary partition on the device."
msgstr ""
"Exécutez la commande <span class=\"command\">create partition primary</span> "
"pour créer une partition primaire sur la clé USB."
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.mdwn b/wiki/src/doc/first_steps/reset/windows.mdwn
index ce025cf..ce025cf 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.mdwn
+++ b/wiki/src/doc/first_steps/reset/windows.mdwn
diff --git a/wiki/src/doc/first_steps/usb_reset/windows.pt.po b/wiki/src/doc/first_steps/reset/windows.pt.po
index 1287df8..7c5d97c 100644
--- a/wiki/src/doc/first_steps/usb_reset/windows.pt.po
+++ b/wiki/src/doc/first_steps/reset/windows.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"PO-Revision-Date: 2012-11-06 16:09-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Resetting a USB Stick, for Windows\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Windows\"]]\n"
msgstr "[[!meta title=\"Resetando a memória USB no Windows\"]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!inline pages=\"doc/first_steps/reset.intro\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.pt\" raw=\"yes\"]]\n"
+msgstr "[[!inline pages=\"doc/first_steps/reset.intro.pt\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -31,9 +33,13 @@ msgid "<div class=\"bug\">\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
+#| "The version of Diskpart does not list removable disks.\n"
msgid ""
"<strong>The following instructions do not work on Windows XP.</strong><br/>\n"
-"The version of Diskpart does not list removable disks.\n"
+"The version of <span class=\"application\">Diskpart</span> on Windows XP does not list removable disks.\n"
msgstr ""
"<strong>As instruções a seguir não funcionam no Windows XP.</strong><br/>\n"
"A versão do Diskpart não lista discos removíveis.\n"
@@ -54,6 +60,7 @@ msgid "<div class=\"caution\">\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
"<strong>You might overwrite any hard drive on the computer.</strong><br/>\n"
"If at some point you are not sure about the disk number, stop proceeding.\n"
@@ -62,7 +69,10 @@ msgstr ""
"\"\"ponto você não tiver certeza de qual dispositivo escolher, interrompa o procedimento.\n"
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick that you want to reset is unplugged."
+#, fuzzy
+#| msgid "Make sure that the USB stick that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
"Tenha certeza de que a memória USB que você quer resetar esteja desconectada."
@@ -126,16 +136,21 @@ msgstr ""
" Disk 0 Online 80 GB 0 B\n"
#. type: Bullet: '4. '
+#, fuzzy
+#| msgid ""
+#| "Plug the USB stick that you want to reset. Run the <span class=\"command"
+#| "\">list disk</span> command again."
msgid ""
-"Plug the USB stick that you want to reset. Run the <span class=\"command"
-"\">list disk</span> command again."
+"Plug the USB stick or SD card that you want to reset. Run the <span class="
+"\"command\">list disk</span> command again."
msgstr ""
"Conecte a memória USB que você quer resetar. Execute o comando <span class="
"\"command\">list disk</span> novamente."
#. type: Plain text
-#, no-wrap
-msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+#, fuzzy, no-wrap
+#| msgid " A new disk, which corresponds to the USB stick, appears in the list.\n"
+msgid " A new disk, which corresponds to that device, appears in the list.\n"
msgstr " Um novo disco, que corresponde á memória USB, aparecerá na lista.\n"
#. type: Plain text
@@ -157,22 +172,32 @@ msgstr ""
" Disk 1 Online 4 GB 0 B\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Make sure that its size corresponds to the size of the USB that you want to\n"
+#| " reset. Note down the disk number assigned by <span\n"
+#| " class=\"application\">Diskpart</span> to the USB stick.\n"
msgid ""
-" Make sure that its size corresponds to the size of the USB that you want to\n"
+" Make sure that its size corresponds to the size of the device that you want to\n"
" reset. Note down the disk number assigned by <span\n"
-" class=\"application\">Diskpart</span> to the USB stick.\n"
+" class=\"application\">Diskpart</span> to the device.\n"
msgstr ""
" Tenha certeza de que o tamanho corresponde ao tamanho do disco USB que\n"
" você quer resetar. Anote o número do disco designado para a memõria USB\n"
" pelo <span class=\"application\">Diskpart</span>.\n"
#. type: Bullet: '5. '
-msgid ""
-"To select the USB stick, execute the following command: <span class=\"command"
+#, fuzzy
+#| msgid ""
+#| "To select the USB stick, execute the following command: <span class="
+#| "\"command\">select disk=<span class=\"replaceable\">number</span></"
+#| "span>. Replace <span class=\"replaceable\">number</span> by the disk "
+#| "number of the USB stick that you want to reset."
+msgid ""
+"To select the device, execute the following command: <span class=\"command"
"\">select disk=<span class=\"replaceable\">number</span></span>. Replace "
-"<span class=\"replaceable\">number</span> by the disk number of the USB "
-"stick that you want to reset."
+"<span class=\"replaceable\">number</span> by the disk number of the device "
+"that you want to reset."
msgstr ""
"Para selecionar a memória USB, execute o seguinte comando: <span class="
"\"command\">select disk=<span class=\"replaceable\">número</span></span>. "
@@ -180,25 +205,37 @@ msgstr ""
"você quer resetar."
#. type: Bullet: '6. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">clean</span> command to remove all "
+#| "partitioning structures from the USB stick."
msgid ""
-"Execute the <span class=\"command\">clean</span> command to remove all "
-"partitioning structures from the USB stick."
+"Execute the <span class=\"command\">clean</span> command to delete the "
+"partition table from the device."
msgstr ""
"Execute o comando <span class=\"command\">clean</span> para remover todas as "
"partições da memória USB."
#. type: Bullet: '7. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">convert mbr</span> command to give "
+#| "the USB stick a partition table."
msgid ""
-"Execute the <span class=\"command\">convert mbr</span> command to give the "
-"USB stick a partition table."
+"Execute the <span class=\"command\">convert mbr</span> command to create a "
+"new partition table on the device."
msgstr ""
"Execute o comando <span class=\"command\">convert mbr</span> para instalar "
"uma partição na memória USB."
#. type: Bullet: '8. '
+#, fuzzy
+#| msgid ""
+#| "Execute the <span class=\"command\">create partition primary</span> "
+#| "command to create a new primary partition on the stick."
msgid ""
"Execute the <span class=\"command\">create partition primary</span> command "
-"to create a new primary partition on the stick."
+"to create a new primary partition on the device."
msgstr ""
"Execute o comando <span class=\"command\">create partition primary</span> "
"para criar uma nova partição primária na memória USB."
diff --git a/wiki/src/doc/first_steps/shutdown.de.po b/wiki/src/doc/first_steps/shutdown.de.po
index cd5fa97..cf47cef 100644
--- a/wiki/src/doc/first_steps/shutdown.de.po
+++ b/wiki/src/doc/first_steps/shutdown.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
#, no-wrap
msgid ""
"This method does not work [[after using the <span class=\"application\">Tails\n"
-"USB installer</span>|support/known_issues#index10h2]], see\n"
+"Installer</span>|support/known_issues#index10h2]], see\n"
"[[!tails_ticket 5677]].\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/shutdown.es.po b/wiki/src/doc/first_steps/shutdown.es.po
index cd5fa97..cf47cef 100644
--- a/wiki/src/doc/first_steps/shutdown.es.po
+++ b/wiki/src/doc/first_steps/shutdown.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
#, no-wrap
msgid ""
"This method does not work [[after using the <span class=\"application\">Tails\n"
-"USB installer</span>|support/known_issues#index10h2]], see\n"
+"Installer</span>|support/known_issues#index10h2]], see\n"
"[[!tails_ticket 5677]].\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/shutdown.fr.po b/wiki/src/doc/first_steps/shutdown.fr.po
index 650e7b6..c64ff5c 100644
--- a/wiki/src/doc/first_steps/shutdown.fr.po
+++ b/wiki/src/doc/first_steps/shutdown.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2013-10-11 06:16-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,8 +65,7 @@ msgid ""
"[[!tails_ticket 5447]]."
msgstr ""
"Cette méthode ne fonctionne pas [[avec les DVD|support/"
-"known_issues#index11h2]],"
-"voir le [[!tails_ticket 5447]]."
+"known_issues#index11h2]],voir le [[!tails_ticket 5447]]."
#. type: Plain text
#, no-wrap
@@ -74,9 +73,14 @@ msgid "</div>\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "This method does not work [[after using the <span class=\"application\">Tails\n"
+#| "USB installer</span>|support/known_issues#index10h2]], see\n"
+#| "[[!tails_ticket 5677]].\n"
msgid ""
"This method does not work [[after using the <span class=\"application\">Tails\n"
-"USB installer</span>|support/known_issues#index10h2]], see\n"
+"Installer</span>|support/known_issues#index10h2]], see\n"
"[[!tails_ticket 5677]].\n"
msgstr ""
"Cette méthode ne fonctionne pas [[après avoir utilisé <span class=\"application\">l'installeur\n"
diff --git a/wiki/src/doc/first_steps/shutdown.pt.po b/wiki/src/doc/first_steps/shutdown.pt.po
index cd5fa97..cf47cef 100644
--- a/wiki/src/doc/first_steps/shutdown.pt.po
+++ b/wiki/src/doc/first_steps/shutdown.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
#, no-wrap
msgid ""
"This method does not work [[after using the <span class=\"application\">Tails\n"
-"USB installer</span>|support/known_issues#index10h2]], see\n"
+"Installer</span>|support/known_issues#index10h2]], see\n"
"[[!tails_ticket 5677]].\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/usb_upgrade.de.po b/wiki/src/doc/first_steps/upgrade.de.po
index c2f55c3..49c4fc4 100644
--- a/wiki/src/doc/first_steps/usb_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-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:56+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,41 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Tails installer</span> also allows you to upgrade\n"
-"a USB stick to a newer version of Tails.\n"
+"<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"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"The following techniques only work if the USB stick was installed using\n"
-"<span class=\"application\">Tails installer</span>. **The persistent storage\n"
-"on the USB stick will be preserved.** There are two methods to do the upgrade:\n"
+"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"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Upgrade by cloning from another USB stick|usb_upgrade#clone]] which "
-"already runs a newer version of Tails"
+"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
+"a newer version of Tails"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Upgrade from an ISO image|usb_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"
-"USB stick that you want to upgrade.\n"
+"<span class=\"application\">Tails Installer</span> from another media than the\n"
+"device that you want to upgrade.\n"
msgstr ""
#. type: Plain text
@@ -67,7 +66,9 @@ msgid "Clone & Upgrade\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Start Tails 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."
msgstr ""
#. type: Plain text
@@ -77,9 +78,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
#. type: Bullet: '3. '
@@ -87,19 +88,19 @@ msgid "Choose <span class=\"guilabel\">Clone & Upgrade</span>."
msgstr ""
#. type: Bullet: '4. '
-msgid "Plug the USB stick that you want to upgrade."
+msgid "Plug the device that you want to upgrade."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
+"Choose the device from the <span class=\"guilabel\">Target Device</span> "
"drop-down list."
msgstr ""
@@ -127,7 +128,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from another media than the USB stick that you want to upgrade."
+"Start Tails from another media than the device, USB stick or SD card, that "
+"you want to upgrade."
msgstr ""
#. type: Bullet: '3. '
diff --git a/wiki/src/doc/first_steps/usb_upgrade.es.po b/wiki/src/doc/first_steps/upgrade.es.po
index c2f55c3..49c4fc4 100644
--- a/wiki/src/doc/first_steps/usb_upgrade.es.po
+++ b/wiki/src/doc/first_steps/upgrade.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:56+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,41 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Tails installer</span> also allows you to upgrade\n"
-"a USB stick to a newer version of Tails.\n"
+"<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"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"The following techniques only work if the USB stick was installed using\n"
-"<span class=\"application\">Tails installer</span>. **The persistent storage\n"
-"on the USB stick will be preserved.** There are two methods to do the upgrade:\n"
+"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"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Upgrade by cloning from another USB stick|usb_upgrade#clone]] which "
-"already runs a newer version of Tails"
+"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
+"a newer version of Tails"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Upgrade from an ISO image|usb_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"
-"USB stick that you want to upgrade.\n"
+"<span class=\"application\">Tails Installer</span> from another media than the\n"
+"device that you want to upgrade.\n"
msgstr ""
#. type: Plain text
@@ -67,7 +66,9 @@ msgid "Clone & Upgrade\n"
msgstr ""
#. type: Bullet: '1. '
-msgid "Start Tails 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."
msgstr ""
#. type: Plain text
@@ -77,9 +78,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
#. type: Bullet: '3. '
@@ -87,19 +88,19 @@ msgid "Choose <span class=\"guilabel\">Clone & Upgrade</span>."
msgstr ""
#. type: Bullet: '4. '
-msgid "Plug the USB stick that you want to upgrade."
+msgid "Plug the device that you want to upgrade."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
#. type: Bullet: '5. '
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
+"Choose the device from the <span class=\"guilabel\">Target Device</span> "
"drop-down list."
msgstr ""
@@ -127,7 +128,8 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"Start Tails from another media than the USB stick that you want to upgrade."
+"Start Tails from another media than the device, USB stick or SD card, that "
+"you want to upgrade."
msgstr ""
#. type: Bullet: '3. '
diff --git a/wiki/src/doc/first_steps/usb_upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index 913a646..f5b2be4 100644
--- a/wiki/src/doc/first_steps/usb_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: 2013-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:56+0300\n"
"PO-Revision-Date: 2013-01-02 11:32-0000\n"
"Last-Translator: saegor <saegor@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,8 +17,9 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
+msgid "[[!meta title=\"Upgrading a Tails USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Mettre à jour une Clé USB Tails\"]]\n"
#. type: Plain text
@@ -27,8 +28,8 @@ msgstr "[[!meta title=\"Mettre à jour une Clé USB Tails\"]]\n"
#| "<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 to a newer version of Tails.\n"
+"<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"
msgstr "<span class=\"application\">Le programme d'installation de Tails sur USB</span> vous permet de mettre à jour une clé USB vers une version plus récente de Tails.\n"
#. type: Plain text
@@ -38,28 +39,35 @@ msgstr "<span class=\"application\">Le programme d'installation de Tails sur USB
#| "<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 USB stick was installed using\n"
-"<span class=\"application\">Tails installer</span>. **The persistent storage\n"
-"on the USB stick will be preserved.** There are two methods to do the upgrade:\n"
+"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"
msgstr ""
"Les procédures qui suivent ne fonctionnent que si la clé USB a été installée par l'intermédiaire du\n"
"<span class=\"application\">programme d'installation 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: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Upgrade by cloning from another USB stick|upgrade#clone]] which "
+#| "already runs a newer version of Tails"
msgid ""
-"[[Upgrade by cloning from another USB stick|usb_upgrade#clone]] which "
-"already runs a newer version of Tails"
+"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
+"a newer version of Tails"
msgstr ""
-"[[Mettre à jour en clonant à partir d'une autre clé USB|usb_upgrade#clone]] "
+"[[Mettre à jour en clonant à partir d'une autre clé USB|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|usb_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|usb_upgrade#from_iso]] d'une "
+"[[Mettre à jour en clonant une image ISO|upgrade#from_iso]] d'une "
"version plus récente de Tails."
#. type: Plain text
@@ -70,8 +78,8 @@ msgstr ""
#| "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"
-"USB stick that you want to upgrade.\n"
+"<span class=\"application\">Tails Installer</span> from another media than the\n"
+"device that you want to upgrade.\n"
msgstr ""
"Comme pour l'installation, vous avez besoin de démarrer le\n"
"<span class=\"application\">Programme d'installation Tails</span> à partir d'un autre média que\n"
@@ -88,7 +96,11 @@ msgid "Clone & Upgrade\n"
msgstr "Cloner & Mettre à jour\n"
#. type: Bullet: '1. '
-msgid "Start Tails from the USB that you want to clone from."
+#, fuzzy
+#| msgid "Start Tails 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."
msgstr "Démarrez Tails depuis la clé USB par laquelle vous voulez cloner."
#. type: Plain text
@@ -106,9 +118,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
"2. Choisissez\n"
" <span class=\"menuchoice\">\n"
@@ -123,21 +135,30 @@ msgid "Choose <span class=\"guilabel\">Clone & Upgrade</span>."
msgstr "Choisissez <span class=\"guilabel\">Cloner & Mettre à jour</span>."
#. type: Bullet: '4. '
-msgid "Plug the USB stick that you want to upgrade."
+#, fuzzy
+#| msgid "Plug the USB stick that you want to upgrade."
+msgid "Plug the device that you want to upgrade."
msgstr "Insérez la clé USB que vous souhaitez mettre à jour."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device, which corresponds to the USB stick, appears in the\n"
+#| " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
" Un nouveau périphérique, qui correspond à la clé USB, apparait dans la liste déroulante des\n"
" <span class=\"guilabel\">Périphériques Cibles</span> .\n"
#. type: Bullet: '5. '
+#, fuzzy
+#| msgid ""
+#| "Choose the USB stick from the <span class=\"guilabel\">Target Device</"
+#| "span> drop-down list."
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
+"Choose the device from the <span class=\"guilabel\">Target Device</span> "
"drop-down list."
msgstr ""
"Choisissez la clé USB dans la liste déroulante des <span class=\"guilabel"
@@ -174,8 +195,13 @@ 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 USB stick that you want to "
+#| "upgrade."
msgid ""
-"Start Tails from another media than the USB stick that you want to upgrade."
+"Start Tails from another media than the device, USB stick or SD card, that "
+"you want to upgrade."
msgstr ""
"Démarrez Tails sur une clé USB différente que celle que vous voulez mettre à "
"jour."
@@ -209,6 +235,7 @@ msgid " <div class=\"tip\">\n"
msgstr ""
#. type: Plain text
+#, 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"
diff --git a/wiki/src/doc/first_steps/usb_upgrade.mdwn b/wiki/src/doc/first_steps/upgrade.mdwn
index 2f33d6a..06ebeea 100644
--- a/wiki/src/doc/first_steps/usb_upgrade.mdwn
+++ b/wiki/src/doc/first_steps/upgrade.mdwn
@@ -7,9 +7,9 @@ The following techniques only work if the device, USB stick or SD card, was inst
<span class="application">Tails Installer</span>. **The persistent storage
on the device will be preserved.** There are two methods to do the upgrade:
- - [[Upgrade by cloning from another device|usb_upgrade#clone]] which already
+ - [[Upgrade by cloning from another device|upgrade#clone]] which already
runs a newer version of Tails
- - [[Upgrade from an ISO image|usb_upgrade#from_iso]] of a newer version of
+ - [[Upgrade from an ISO image|upgrade#from_iso]] of a newer version of
Tails
As for the installation, you need to start
diff --git a/wiki/src/doc/first_steps/usb_upgrade.pt.po b/wiki/src/doc/first_steps/upgrade.pt.po
index 6aa4e6d..618dcc8 100644
--- a/wiki/src/doc/first_steps/usb_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-10-14 14:12+0300\n"
+"POT-Creation-Date: 2013-10-24 01:56+0300\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"
@@ -16,8 +16,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Upgrading a Tails USB Stick\"]]\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
@@ -26,8 +27,8 @@ msgstr "[[!meta title=\"Atualizando uma memória USB com Tails\"]]\n"
#| "<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 to a newer version of Tails.\n"
+"<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"
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"
@@ -39,28 +40,35 @@ 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 USB stick was installed using\n"
-"<span class=\"application\">Tails installer</span>. **The persistent storage\n"
-"on the USB stick will be preserved.** There are two methods to do the upgrade:\n"
+"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"
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: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Upgrade by cloning from another USB stick|upgrade#clone]] which "
+#| "already runs a newer version of Tails"
msgid ""
-"[[Upgrade by cloning from another USB stick|usb_upgrade#clone]] which "
-"already runs a newer version of Tails"
+"[[Upgrade by cloning from another device|upgrade#clone]] which already runs "
+"a newer version of Tails"
msgstr ""
-"[[Atualizar clonando de uma outra memória USB|usb_upgrade#clone]] que já "
+"[[Atualizar clonando de uma outra memória USB|upgrade#clone]] que já "
"contenha uma versão nova do 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|usb_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|usb_upgrade#from_iso]] de uma versão mais nova "
+"[[Atualizar de uma imagem ISO|upgrade#from_iso]] de uma versão mais nova "
"do Tails"
#. type: Plain text
@@ -71,8 +79,8 @@ msgstr ""
#| "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"
-"USB stick that you want to upgrade.\n"
+"<span class=\"application\">Tails Installer</span> from another media than the\n"
+"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"
@@ -92,7 +100,9 @@ msgstr "Clonar & Atualizar\n"
#| msgid ""
#| "Start Tails, version 0.11 or later, from the USB that you want to clone "
#| "from."
-msgid "Start Tails 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."
msgstr ""
"Inicie o Tails, versão 0.11 ou maior, a partir do dispositivo USB que você "
"quer clonar."
@@ -112,9 +122,9 @@ msgid ""
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Tails installer</span>\n"
+" <span class=\"guimenuitem\">Tails Installer</span>\n"
" </span>\n"
-" to start <span class=\"application\">Tails installer</span>.\n"
+" to start <span class=\"application\">Tails Installer</span>.\n"
msgstr ""
"2. Escolha\n"
" <span class=\"menuchoice\">\n"
@@ -129,21 +139,30 @@ msgid "Choose <span class=\"guilabel\">Clone & Upgrade</span>."
msgstr "Escolha <span class=\"guilabel\">Clonar & Atualizar</span>."
#. type: Bullet: '4. '
-msgid "Plug the USB stick that you want to upgrade."
+#, fuzzy
+#| msgid "Plug the USB stick that you want to upgrade."
+msgid "Plug the device that you want to upgrade."
msgstr "Conecte a memória USB que você quer atualizar."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " A new device, which corresponds to the USB stick, appears in the\n"
+#| " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgid ""
-" A new device, which corresponds to the USB stick, appears in the\n"
+" A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr ""
" Um novo dispositivo, que corresponde à memória USB, aparecerá na\n"
" lista de opções <span class=\"guilabel\">Dispositivos de Destino</span>.\n"
#. type: Bullet: '5. '
+#, fuzzy
+#| msgid ""
+#| "Choose the USB stick from the <span class=\"guilabel\">Target Device</"
+#| "span> drop-down list."
msgid ""
-"Choose the USB stick from the <span class=\"guilabel\">Target Device</span> "
+"Choose the device from the <span class=\"guilabel\">Target Device</span> "
"drop-down list."
msgstr ""
"Escolha a memória USB a partir da lista de opções <span class=\"guilabel"
@@ -185,7 +204,8 @@ 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 USB stick that you want to upgrade."
+"Start Tails from another media than the device, USB stick or SD card, 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 "
"memória USB que você quer atualizar."
@@ -218,6 +238,7 @@ msgid " <div class=\"tip\">\n"
msgstr ""
#. type: Plain text
+#, 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"
diff --git a/wiki/src/doc/first_steps/usb_reset.pt.po b/wiki/src/doc/first_steps/usb_reset.pt.po
deleted file mode 100644
index 283dd04..0000000
--- a/wiki/src/doc/first_steps/usb_reset.pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-17 15:08+0300\n"
-"PO-Revision-Date: 2012-11-06 16:05-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\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 title=\"Uninstalling Tails or Resetting a USB Stick\"]]\n"
-msgstr "[[!meta title=\"Desinstalando o Tails ou resetando a memória USB\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.pt\" raw=\"yes\"]]\n"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Linux with Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/linux]]"
-msgstr "[[Instruções para Linux com Gnome: Ubuntu, Debian, Tails, etc.|usb_reset/linux]]"
-
-#. type: Bullet: ' - '
-msgid "[[Instructions for Windows|usb_reset/windows]]"
-msgstr "[[Instruções para Windows|usb_reset/windows]]"
-
diff --git a/wiki/src/doc/get.index.de.po b/wiki/src/doc/get.index.de.po
index f38b2c8..f5d97fe 100644
--- a/wiki/src/doc/get.index.de.po
+++ b/wiki/src/doc/get.index.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-12 16:47+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgid ""
" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-" - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+" - [[Burn a DVD or install onto a USB stick or SD card|download#media]]\n"
" - [[Stay tuned|download#stay_tuned]]\n"
" - [[Start Tails!|download#start]]\n"
msgstr ""
diff --git a/wiki/src/doc/get.index.es.po b/wiki/src/doc/get.index.es.po
index cb6e82e..98e699b 100644
--- a/wiki/src/doc/get.index.es.po
+++ b/wiki/src/doc/get.index.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-12 16:47+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgid ""
" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-" - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+" - [[Burn a DVD or install onto a USB stick or SD card|download#media]]\n"
" - [[Stay tuned|download#stay_tuned]]\n"
" - [[Start Tails!|download#start]]\n"
msgstr ""
diff --git a/wiki/src/doc/get.index.fr.po b/wiki/src/doc/get.index.fr.po
index fa4c38a..451acb4 100644
--- a/wiki/src/doc/get.index.fr.po
+++ b/wiki/src/doc/get.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-12 16:47+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: 2012-05-17 16:47+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -24,14 +24,23 @@ msgid "[[Download the ISO image|download#download_iso]]"
msgstr "[[Télécharger l'image ISO|download#download_iso]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Verify the ISO image|download#verify]]\n"
+#| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+#| " - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
+#| " - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
+#| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#| " - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+#| " - [[Stay tuned|download#stay_tuned]]\n"
+#| " - [[Start Tails!|download#start]]\n"
msgid ""
" - [[Verify the ISO image|download#verify]]\n"
" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-" - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+" - [[Burn a DVD or install onto a USB stick or SD card|download#media]]\n"
" - [[Stay tuned|download#stay_tuned]]\n"
" - [[Start Tails!|download#start]]\n"
msgstr ""
diff --git a/wiki/src/doc/get.index.pt.po b/wiki/src/doc/get.index.pt.po
index 38fb7b1..7beaace 100644
--- a/wiki/src/doc/get.index.pt.po
+++ b/wiki/src/doc/get.index.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-06-06 23:52+0300\n"
+"POT-Creation-Date: 2013-10-24 01:48+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,29 +25,31 @@ msgid "[[Download the ISO image|download#download_iso]]"
msgstr "[[Baixe a imagem ISO|download#download_iso]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Verify the ISO image|download#verify]]\n"
+#| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+#| " - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
+#| " - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
+#| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#| " - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+#| " - [[Stay tuned|download#stay_tuned]]\n"
+#| " - [[Start Tails!|download#start]]\n"
msgid ""
" - [[Verify the ISO image|download#verify]]\n"
-" - [[Using Gnome: Ubuntu, Debian, Tails, "
-"etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Using Linux with the command "
-"line|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Using other operating "
-"systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
+" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
+" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-" - [[Burn a DVD or install onto a USB stick|download#media]]\n"
+" - [[Burn a DVD or install onto a USB stick or SD card|download#media]]\n"
" - [[Stay tuned|download#stay_tuned]]\n"
" - [[Start Tails!|download#start]]\n"
msgstr ""
" - [[Verifique a imagem ISO|download#verify]]\n"
-" - [[Usando Gnome: Ubuntu, Debian, Tails, "
-"etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Usando linux com a linha de "
-"comando|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Usando outros sistemas operacionais"
-"|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Confiando na chave de assinatura do Tails"
-"|get/trusting_tails_signing_key]]\n"
+" - [[Usando Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+" - [[Usando linux com a linha de comando|get/verify_the_iso_image_using_the_command_line]]\n"
+" - [[Usando outros sistemas operacionais|get/verify_the_iso_image_using_other_operating_systems]]\n"
+" - [[Confiando na chave de assinatura do Tails|get/trusting_tails_signing_key]]\n"
" - [[Grave um DVD ou instale em uma memória USB|download#media]]\n"
" - [[Fique ligado/a|download#stay_tuned]]\n"
" - [[Inicie o Tails!|download#start]]\n"
diff --git a/wiki/src/doc/introduction.de.po b/wiki/src/doc/introduction.de.po
index 7bfd5ce..e2ccbb1 100644
--- a/wiki/src/doc/introduction.de.po
+++ b/wiki/src/doc/introduction.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-18 22:40+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,25 +32,25 @@ msgstr ""
#. type: Plain text
msgid ""
-"It will **not** fully document the applications included in Tails, but rather "
-"give an overview of them and go on details only on the Tails-specific "
+"It will **not** fully document the applications included in Tails, but "
+"rather give an overview of them and go on details only on the Tails-specific "
"configuration."
msgstr ""
#. type: Plain text
msgid ""
"It is quite long so you might want to not read it in one go but instead read "
-"[[about]], [[about/warning]] and the [[conclusion]], as well as the sections "
-"on only those applications you intend to use with the possibility to return "
-"to it whenever you want to try something new or use it for reference."
+"[[about]] and [[about/warning]], as well as the sections on only those "
+"applications you intend to use with the possibility to return to it whenever "
+"you want to try something new or use it for reference."
msgstr ""
#. type: Plain text
msgid ""
"If you have experience with these applications and concepts from elsewhere "
"and feel comfortable with the user interface in general, reading this "
-"document is maybe not necessary at all. A word of caution to all users is not "
-"to alter the network, proxy and firewall settings unless you know what you "
-"are doing – poking around with them too much might spoil the built-in "
+"document is maybe not necessary at all. A word of caution to all users is "
+"not to alter the network, proxy and firewall settings unless you know what "
+"you are doing – poking around with them too much might spoil the built-in "
"defences of Tails."
msgstr ""
diff --git a/wiki/src/doc/introduction.es.po b/wiki/src/doc/introduction.es.po
index e2abe99..88c02d7 100644
--- a/wiki/src/doc/introduction.es.po
+++ b/wiki/src/doc/introduction.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-18 22:40+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,33 +31,34 @@ msgid ""
msgstr ""
"El objetivo de esta documentación es presentar The Amnesic Incognito Live "
"System (Tails) en un formato fácil de entender y lo más completo posible, "
-"para dar al usuario un curso intensivo sobre lo que podría ser un conjunto completamente nuevo "
-"de aplicaciones y conceptos relacionados con el anonimato y la seguridad en "
-"Internet."
+"para dar al usuario un curso intensivo sobre lo que podría ser un conjunto "
+"completamente nuevo de aplicaciones y conceptos relacionados con el "
+"anonimato y la seguridad en Internet."
#. type: Plain text
msgid ""
-"It will **not** fully document the applications included in Tails, but rather "
-"give an overview of them and go on details only on the Tails-specific "
+"It will **not** fully document the applications included in Tails, but "
+"rather give an overview of them and go on details only on the Tails-specific "
"configuration."
msgstr ""
-"**No** se documentarán completamente las aplicaciones incluidas en Tails. En cambio, sólo se dará una visión general de ellas, y se detallarán las configuraciones específicas "
-"a Tails."
+"**No** se documentarán completamente las aplicaciones incluidas en Tails. En "
+"cambio, sólo se dará una visión general de ellas, y se detallarán las "
+"configuraciones específicas a Tails."
#. type: Plain text
msgid ""
"It is quite long so you might want to not read it in one go but instead read "
-"[[about]], [[about/warning]] and the [[conclusion]], as well as the sections "
-"on only those applications you intend to use with the possibility to return "
-"to it whenever you want to try something new or use it for reference."
+"[[about]] and [[about/warning]], as well as the sections on only those "
+"applications you intend to use with the possibility to return to it whenever "
+"you want to try something new or use it for reference."
msgstr ""
#. type: Plain text
msgid ""
"If you have experience with these applications and concepts from elsewhere "
"and feel comfortable with the user interface in general, reading this "
-"document is maybe not necessary at all. A word of caution to all users is not "
-"to alter the network, proxy and firewall settings unless you know what you "
-"are doing – poking around with them too much might spoil the built-in "
+"document is maybe not necessary at all. A word of caution to all users is "
+"not to alter the network, proxy and firewall settings unless you know what "
+"you are doing – poking around with them too much might spoil the built-in "
"defences of Tails."
msgstr ""
diff --git a/wiki/src/doc/introduction.fr.po b/wiki/src/doc/introduction.fr.po
index d02a009..9058cef 100644
--- a/wiki/src/doc/introduction.fr.po
+++ b/wiki/src/doc/introduction.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2013-09-09 13:08+0200\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: 2013-06-17 19:25-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,11 +47,18 @@ msgstr ""
"détaillées."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "It is quite long so you might want to not read it in one go but instead "
+#| "read [[about]], [[about/warning]] and the [[conclusion]], as well as the "
+#| "sections on only those applications you intend to use with the "
+#| "possibility to return to it whenever you want to try something new or use "
+#| "it for reference."
msgid ""
"It is quite long so you might want to not read it in one go but instead read "
-"[[about]], [[about/warning]] and the [[conclusion]], as well as the sections "
-"on only those applications you intend to use with the possibility to return "
-"to it whenever you want to try something new or use it for reference."
+"[[about]] and [[about/warning]], as well as the sections on only those "
+"applications you intend to use with the possibility to return to it whenever "
+"you want to try something new or use it for reference."
msgstr ""
"Tout cela étant assez long, peut-être ne souhaitez-vous pas lire tout de A à "
"Z. Dans ce cas, lisez au moins [[l'introduction|about]] et la "
diff --git a/wiki/src/doc/introduction.mdwn b/wiki/src/doc/introduction.mdwn
index 62b201b..758daff 100644
--- a/wiki/src/doc/introduction.mdwn
+++ b/wiki/src/doc/introduction.mdwn
@@ -11,7 +11,7 @@ give an overview of them and go on details only on the Tails-specific
configuration.
It is quite long so you might want to not read it in one go but
-instead read [[about]], [[about/warning]] and the [[conclusion]], as well as the sections
+instead read [[about]] and [[about/warning]], as well as the sections
on only those applications you intend to use with the possibility to
return to it whenever you want to try something new or use it for
reference.
diff --git a/wiki/src/doc/introduction.pt.po b/wiki/src/doc/introduction.pt.po
index b6c68c1..bf5e2d2 100644
--- a/wiki/src/doc/introduction.pt.po
+++ b/wiki/src/doc/introduction.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-17 15:08+0300\n"
+"POT-Creation-Date: 2013-10-24 02:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,33 +28,42 @@ msgid ""
"hope to give the new user a crash course in what might be a completely new "
"set of applications and concepts regarding anonymity and security on the "
"Internet."
-msgstr "O objetivo desta documentação é apresentar o The Amnesic Incognito "
-"Live System (Tails) de uma forma razoavelmente completa e fácil de "
-"compreender com o objetivo de prover ao novo usuário um curso intensivo no "
-"que pode ser um conjunto completamente novo de aplicações e conceitos "
-"relacionados a anonimidade e segurança na Internet."
+msgstr ""
+"O objetivo desta documentação é apresentar o The Amnesic Incognito Live "
+"System (Tails) de uma forma razoavelmente completa e fácil de compreender "
+"com o objetivo de prover ao novo usuário um curso intensivo no que pode ser "
+"um conjunto completamente novo de aplicações e conceitos relacionados a "
+"anonimidade e segurança na Internet."
#. type: Plain text
msgid ""
"It will **not** fully document the applications included in Tails, but "
"rather give an overview of them and go on details only on the Tails-specific "
"configuration."
-msgstr "Esta documentação **não** tem como objetivo documentar completamente "
-"as aplicações contidas no Tails, mas sim dar uma visão geral delas e entrar "
-"em detalhes apenas nas configurações especificas do Tails."
+msgstr ""
+"Esta documentação **não** tem como objetivo documentar completamente as "
+"aplicações contidas no Tails, mas sim dar uma visão geral delas e entrar em "
+"detalhes apenas nas configurações especificas do Tails."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "It is quite long so you might want to not read it in one go but instead "
+#| "read [[about]], [[about/warning]] and the [[conclusion]], as well as the "
+#| "sections on only those applications you intend to use with the "
+#| "possibility to return to it whenever you want to try something new or use "
+#| "it for reference."
msgid ""
"It is quite long so you might want to not read it in one go but instead read "
-"[[about]], [[about/warning]] and the [[conclusion]], as well as the sections "
-"on only those applications you intend to use with the possibility to return "
-"to it whenever you want to try something new or use it for reference."
-msgstr "Ela é bastante longa, de forma que você pode não querer lê-la de uma "
-"só vez, mas ao invés disso ler [[sobre|about]], a "
-"[[advertência|about/warning]] e a [[conclusão|conclusion]], bem como as "
-"seções sobre aquelas aplicações que você pretende usar, com a possibilidade "
-"de voltar para esta documentação sempre que você quiser tentar algo novo ou "
-"usá-la para referência."
+"[[about]] and [[about/warning]], as well as the sections on only those "
+"applications you intend to use with the possibility to return to it whenever "
+"you want to try something new or use it for reference."
+msgstr ""
+"Ela é bastante longa, de forma que você pode não querer lê-la de uma só vez, "
+"mas ao invés disso ler [[sobre|about]], a [[advertência|about/warning]] e a "
+"[[conclusão|conclusion]], bem como as seções sobre aquelas aplicações que "
+"você pretende usar, com a possibilidade de voltar para esta documentação "
+"sempre que você quiser tentar algo novo ou usá-la para referência."
#. type: Plain text
msgid ""
@@ -64,9 +73,10 @@ msgid ""
"not to alter the network, proxy and firewall settings unless you know what "
"you are doing – poking around with them too much might spoil the built-in "
"defences of Tails."
-msgstr "Se você já possui alguma experiência com estas aplicações e "
-"conceitos e se sente confortãvel com a interface de usuário em geral, "
-"talvez seja totalmente desnecessário ler esta documentação. Um aviso de "
-"cautela para todos os usuários é de não alterar as configurações de rede, "
-"proxy e firewall, a menos que você saiba o que está fazendo - bisbilhotar "
-"demais pode estragar as defesas do Tails."
+msgstr ""
+"Se você já possui alguma experiência com estas aplicações e conceitos e se "
+"sente confortãvel com a interface de usuário em geral, talvez seja "
+"totalmente desnecessário ler esta documentação. Um aviso de cautela para "
+"todos os usuários é de não alterar as configurações de rede, proxy e "
+"firewall, a menos que você saiba o que está fazendo - bisbilhotar demais "
+"pode estragar as defesas do Tails."