summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-07 15:30:54 +0000
committerintrigeri <intrigeri@boum.org>2015-07-07 15:30:54 +0000
commitee66adf81ede991e3f4de448e08bd939031c7926 (patch)
tree95f47e56be6fde595f48e12d1800eecd9d6c772e
parentbdeb813fdfb5a4ad594cd3d65d17bba1549fc062 (diff)
parenta707d5fd021b1257353d667b0a193cc1e907a87b (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--wiki/src/about.fr.po10
-rw-r--r--wiki/src/doc/about/features.fr.po3
-rw-r--r--wiki/src/doc/about/warning.fr.po3
-rw-r--r--wiki/src/doc/advanced_topics.index.fr.po3
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po9
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po8
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fr.po12
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.fr.po3
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.fr.po9
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.fr.po3
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.fr.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.fr.po8
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po3
-rw-r--r--wiki/src/doc/first_steps.index.de.po15
-rw-r--r--wiki/src/doc/first_steps.index.fr.po47
-rw-r--r--wiki/src/doc/first_steps.index.mdwn13
-rw-r--r--wiki/src/doc/first_steps.index.pt.po15
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po3
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po15
-rw-r--r--wiki/src/doc/first_steps/persistence/use.fr.po3
-rw-r--r--wiki/src/doc/first_steps/reset/linux.de.po4
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po102
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fr.po102
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn37
-rw-r--r--wiki/src/doc/first_steps/reset/mac.pt.po102
-rw-r--r--wiki/src/doc/first_steps/reset/windows.de.po8
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po3
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po3
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po3
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.de.po11
-rw-r--r--wiki/src/doc/introduction.de.po4
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/metadata.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.fr.po3
-rw-r--r--wiki/src/download.html1
-rw-r--r--wiki/src/support/faq.de.po23
-rw-r--r--wiki/src/support/faq.fr.po25
-rw-r--r--wiki/src/support/faq.mdwn12
-rw-r--r--wiki/src/support/faq.pt.po25
41 files changed, 545 insertions, 137 deletions
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index c278671..f0f35f8 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2015-03-13 16:25+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -77,7 +77,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[!toc levels=1]]\n"
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -88,7 +87,6 @@ msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, no-wrap
-#| msgid "Online anonymity and censorship circumvention with Tor\n"
msgid "Online anonymity and censorship circumvention\n"
msgstr "Anonymat en ligne et contournement de la censure\n"
@@ -233,18 +231,12 @@ msgstr ""
"net), qui est un réseau d'anonymisation différent de Tor."
#. type: Plain text
-#| msgid ""
-#| "[[Read more about those tools in the documentation.|doc/"
-#| "encryption_and_privacy]]"
msgid ""
"[[Learn how to use I2P in Tails in the documentation.|doc/anonymous_internet/"
"i2p]]"
msgstr "[[En savoir plus sur I2P dans Tails.|doc/anonymous_internet/i2p]]"
#. type: Plain text
-#| msgid ""
-#| "To learn more about how the usage of Tor is enforced, see our [[design "
-#| "document|contribute/design/Tor_enforcement]]."
msgid ""
"To know how I2P is implemented in Tails, see our [[design document|"
"contribute/design/I2P]]."
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index 854a123..c174dd3 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 13:26+0200\n"
"Last-Translator: \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"
diff --git a/wiki/src/doc/about/warning.fr.po b/wiki/src/doc/about/warning.fr.po
index 2fae78f..6c30d02 100644
--- a/wiki/src/doc/about/warning.fr.po
+++ b/wiki/src/doc/about/warning.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-24 09:18+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 19:16-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"
diff --git a/wiki/src/doc/advanced_topics.index.fr.po b/wiki/src/doc/advanced_topics.index.fr.po
index 3691e76..b6c05be 100644
--- a/wiki/src/doc/advanced_topics.index.fr.po
+++ b/wiki/src/doc/advanced_topics.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-02-17 14:18-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -17,7 +17,6 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Bullet: ' - '
-#| msgid "[[!traillink Virtualization|advanced_topics/virtualization]]"
msgid ""
"[[!traillink Install_additional_software|advanced_topics/"
"additional_software]]"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
index 3987d1d..7420041 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-07 18:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-07 22:18+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,7 +62,6 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"tip\">\n"
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -142,7 +141,8 @@ msgstr "Installation\n"
#. type: Plain text
msgid "To install *virt-manager* in Debian, execute the following command:"
-msgstr "Pour installer *virt-manager* dans Debian, exécuter la commande suivante :"
+msgstr ""
+"Pour installer *virt-manager* dans Debian, exécuter la commande suivante :"
#. type: Plain text
#, no-wrap
@@ -151,7 +151,8 @@ msgstr " sudo apt-get install virt-manager libvirt-daemon-system\n"
#. type: Plain text
msgid "To install *virt-manager* in Ubuntu, execute the following command:"
-msgstr "Pour installer *virt-manager* dans Ubuntu, exécuter la commande suivante :"
+msgstr ""
+"Pour installer *virt-manager* dans Ubuntu, exécuter la commande suivante :"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 10323fd..e424082 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-08 18:46+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -52,9 +52,6 @@ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
#. type: Bullet: ' - '
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_<span_class=\"application"
-#| "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
msgid ""
"[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
"\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
@@ -63,9 +60,6 @@ msgstr ""
"\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#. type: Bullet: ' - '
-#| msgid ""
-#| "[[!traillink Exchange_bitcoins_using_<span_class=\"application"
-#| "\">Electrum</span></span>|anonymous_internet/electrum]]"
msgid ""
"[[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</"
"span>|anonymous_internet/electrum]]"
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
index 1938950..b04fdd1 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 19:29+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-06-01 00:30-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"
@@ -59,7 +60,6 @@ msgstr "[[!toc levels=2]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"noscript\"></a>\n"
msgid "<a id=\"confinement\"></a>\n"
msgstr ""
@@ -381,7 +381,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"noscript\"></a>\n"
msgid "<a id=\"security_slider\"></a>\n"
msgstr ""
@@ -422,7 +421,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
msgid "[[!img security_slider.png link=\"no\" alt=\"Security slider in its default value (low)\"]]\n"
msgstr ""
@@ -443,10 +441,6 @@ msgstr "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "To allow more control over JavaScript, for example to disable JavaScript\n"
-#| "completely, <span class=\"application\">Tor Browser</span> includes the <span class=\"application\">NoScript</span>\n"
-#| "extension.\n"
msgid ""
"To allow more control over JavaScript, for example to disable JavaScript\n"
"completely on some websites, <span class=\"application\">Tor Browser</span> includes the <span class=\"application\">NoScript</span>\n"
@@ -480,7 +474,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"https\"></a>\n"
msgid "<a id=\"new_identity\"></a>\n"
msgstr ""
@@ -523,7 +516,6 @@ msgstr "Efface le contenu du presse-papier."
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"note\">\n"
msgid "<div class=\"caution\">\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.fr.po b/wiki/src/doc/anonymous_internet/claws_mail.fr.po
index 24ffdc8..9e040d9 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail.fr.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-03 14:04+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-31 16:02-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/anonymous_internet/electrum.fr.po b/wiki/src/doc/anonymous_internet/electrum.fr.po
index bb45bee..eb48530 100644
--- a/wiki/src/doc/anonymous_internet/electrum.fr.po
+++ b/wiki/src/doc/anonymous_internet/electrum.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-04-21 23:21+0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-04-21 23:23-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,9 +23,6 @@ msgstr "[[!meta title=\"Échanger des bitcoins avec Electrum\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<span class=\"application\">Electrum</span> is a [[!wikipedia bitcoin]] client that is\n"
-#| "particularly suited to the context of Tails because:\n"
msgid ""
"[<span class=\"application\">Electrum</span>](https://electrum.org/) is a [[!wikipedia bitcoin]] client that is\n"
"particularly suited to the context of Tails because:\n"
@@ -101,9 +99,6 @@ msgstr ""
"</span>.\n"
#. type: Plain text
-#| msgid ""
-#| "To learn how to use *Electrum*, read the [documentation on the *Electrum* "
-#| "website](https://electrum.org/)."
msgid ""
"To learn how to use *Electrum*, read the [documentation on the *Electrum* "
"wiki](http://electrum.orain.org/)."
diff --git a/wiki/src/doc/anonymous_internet/i2p.fr.po b/wiki/src/doc/anonymous_internet/i2p.fr.po
index 0fedee0..f3330d0 100644
--- a/wiki/src/doc/anonymous_internet/i2p.fr.po
+++ b/wiki/src/doc/anonymous_internet/i2p.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-15 17:12+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 23:19-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"
diff --git a/wiki/src/doc/anonymous_internet/vidalia.fr.po b/wiki/src/doc/anonymous_internet/vidalia.fr.po
index e96a5d3..7473a57 100644
--- a/wiki/src/doc/anonymous_internet/vidalia.fr.po
+++ b/wiki/src/doc/anonymous_internet/vidalia.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 23:21+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-05-11 13:23-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,10 +23,6 @@ msgstr "[[!meta title=\"Contrôler Tor grâce à Vidalia\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<span class=\"application\">Vidalia</span> allows you to control some of the\n"
-#| "functionalities of Tor. It is started automatically when an [[Internet\n"
-#| "connection|networkmanager]] is established.\n"
msgid ""
"<span class=\"application\">Vidalia</span> allows you to control some of the\n"
"functionalities of Tor. Unless [[first_steps/startup_options/Windows_Camouflage]] is enabled, Vidalia will\n"
@@ -272,15 +268,11 @@ msgstr "<a id=\"new_identity\"></a>\n"
#. type: Title =
#, no-wrap
-#| msgid "The <span class=\"guilabel\">New Identity</span> feature\n"
msgid "<span class=\"guilabel\">New Identity</span> feature\n"
msgstr "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</span>\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "The <span class=\"guilabel\">Network Map</span> feature displays information about\n"
-#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
"to use new circuits but only for new connections.\n"
@@ -339,10 +331,6 @@ msgstr ""
"first_steps/startup_options/bridge_mode]]."
#. type: Bullet: ' - '
-#| msgid ""
-#| "It is impossible to edit the <span class=\"filename\">torrc</span> "
-#| "configuration file using <span class=\"application\">Vidalia</span>. See "
-#| "[[!tails_ticket 6601]]."
msgid ""
"It is impossible to edit the <span class=\"filename\">torrc</span> "
"configuration file using <span class=\"application\">Vidalia</span>."
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po b/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
index f23b9db..4a4826c 100644
--- a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-23 18:30+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-03-01 12:15-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -139,6 +140,7 @@ msgid "To do so you can execute the following command:"
msgstr "Pour faire cela vous pouvez exécuter la commande suivante :"
#. type: Plain text
-#, no-wrap
-msgid " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
+#, fuzzy, no-wrap
+#| msgid " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
+msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
msgstr " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
index 0d4ce12..d06034d 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 17:01+0100\n"
+"POT-Creation-Date: 2015-07-07 16:35+0300\n"
"PO-Revision-Date: 2015-07-01 23:12-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index 98273a6..1a67e3e 100644
--- a/wiki/src/doc/first_steps.index.de.po
+++ b/wiki/src/doc/first_steps.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-14 19:32+0300\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-06-08 17:10+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,13 +63,14 @@ msgstr "[[!traillink Eine_DVD_brennen|first_steps/dvd]]"
#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
" - [[!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"
+" - [[!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"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\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"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index 92ef7cf..95e96c0 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: 2014-11-29 10:09+0100\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-10-08 08:44-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -31,16 +31,47 @@ msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
msgstr "[[!traillink Graver_un_DVD|first_steps/dvd]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!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"
+#| " - Uninstalling Tails or resetting a USB stick or SD card,\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"
+#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+#| " - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
+#| " - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
+#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\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 Encrypted_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 Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
+#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
+#| " - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\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_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\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"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\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"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index f69cca5..677dd87 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,13 +1,14 @@
- [[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]
- [[!traillink Burning_a_DVD|first_steps/dvd]]
- [[!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]],
+ - [[!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]]
- - Uninstalling Tails or resetting a USB stick or SD card,
- using [[!traillink Linux|first_steps/reset/linux]],
- using [[!traillink Windows|first_steps/reset/windows]]
+ [[!traillink Windows|first_steps/installation/manual/windows]],
+ or [[!traillink Mac|first_steps/installation/manual/mac]]
+ - Uninstalling Tails or resetting a USB stick or SD card
+ using [[!traillink Linux|first_steps/reset/linux]]
+ [[!traillink Windows|first_steps/reset/windows]],
+ or [[!traillink Mac|first_steps/reset/mac]]
- [[!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]]
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index 8b56566..a3d4f9c 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: 2014-09-14 19:32+0300\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-07-30 18:34-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,13 +62,14 @@ msgstr "[[!traillink Gravando_um_DVD|first_steps/dvd]]"
#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
" - [[!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"
+" - [[!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"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\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"
diff --git a/wiki/src/doc/first_steps/installation.fr.po b/wiki/src/doc/first_steps/installation.fr.po
index 93041e9..653e7d1 100644
--- a/wiki/src/doc/first_steps/installation.fr.po
+++ b/wiki/src/doc/first_steps/installation.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 23:21+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 19:32-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index 730dfb0..a7497a3 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 19:58+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-02 11:26-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -81,7 +82,6 @@ msgstr "[[!img applications.png link=no alt=\"Menu des applications\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"help\"></a>\n"
msgstr "<a id=\"help\"></a>\n"
@@ -306,7 +306,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"claws_mail\"></a>\n"
msgstr "<a id=\"claws_mail\"></a>\n"
@@ -317,12 +316,6 @@ msgstr "[[!img claws-mail.png link=no]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<div class=\"text\">\n"
-#| "<strong>Pidgin</strong>: instant messaging client<br/>\n"
-#| "[[See the corresponding documentation|anonymous_internet/pidgin]]\n"
-#| "</div>\n"
-#| "</div>\n"
msgid ""
"<div class=\"text\"><strong>Claws Mail</strong>: email client<br />\n"
"[[See the corresponding documentation|anonymous_internet/claws_mail]]\n"
@@ -541,9 +534,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<a id=\"audio\"></a>\n"
-#| "<div class=\"icon\">\n"
msgid ""
"<a id=\"keyboard_layout\"></a>\n"
"<div class=\"icon\">\n"
@@ -733,7 +723,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"nautilus\"></a>\n"
msgstr "<a id=\"nautilus\"></a>\n"
diff --git a/wiki/src/doc/first_steps/persistence/use.fr.po b/wiki/src/doc/first_steps/persistence/use.fr.po
index a309b8a..9a51025 100644
--- a/wiki/src/doc/first_steps/persistence/use.fr.po
+++ b/wiki/src/doc/first_steps/persistence/use.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-29 10:09+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-02 17:11-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/first_steps/reset/linux.de.po b/wiki/src/doc/first_steps/reset/linux.de.po
index fbfd6a6..e0a5a81 100644
--- a/wiki/src/doc/first_steps/reset/linux.de.po
+++ b/wiki/src/doc/first_steps/reset/linux.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-06-04 06:53+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails localization <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/reset/mac.de.po b/wiki/src/doc/first_steps/reset/mac.de.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.de.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<strong>You might overwrite any hard disk on the computer.</strong> If at "
+"some\n"
+"point you are not sure about which device to choose, stop proceeding.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+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. 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 list of storage devices, verify that the device corresponds to the "
+"device that you want to reset, its brand, its size, etc."
+msgstr ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/mac.fr.po b/wiki/src/doc/first_steps/reset/mac.fr.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.fr.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<strong>You might overwrite any hard disk on the computer.</strong> If at "
+"some\n"
+"point you are not sure about which device to choose, stop proceeding.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+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. 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 list of storage devices, verify that the device corresponds to the "
+"device that you want to reset, its brand, its size, etc."
+msgstr ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/mac.mdwn b/wiki/src/doc/first_steps/reset/mac.mdwn
new file mode 100644
index 0000000..2217888
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.mdwn
@@ -0,0 +1,37 @@
+[[!meta title="Resetting a USB stick or SD card using Mac OSX"]]
+
+[[!inline pages="doc/first_steps/usb_reset.intro" raw="yes"]]
+
+<a id="disk_utility"></a>
+
+Using <span class="application">Disk Utility</span>
+===================================================
+
+<div class="caution">
+
+<strong>You might overwrite any hard disk on the computer.</strong> If at some
+point you are not sure about which device to choose, stop proceeding.
+
+</div>
+
+1. Make sure that the USB stick or SD card that you want to reset is unplugged.
+
+2. Start <span class="application">Disk Utility</span>.
+
+ A list of all the storage devices on the computer appears in the left pane
+ of the window.
+
+3. Plug the USB stick or SD card that you want to reset.
+
+ A new device appears in the list of storage devices. This new device
+ corresponds to the USB stick or SD card that you plugged in. Click on it.
+
+4. In the list of storage devices, verify that the device corresponds
+ to the device that you want to reset, its brand, its size, etc.
+
+5. To reset the device, click on the <span class="guilabel">Erase</span> tab
+ in the right pane and click on the <span class="button">Erase</span> button
+ on the bottom right.
+
+6. In the confirmation dialog, click on the <span class="button">Erase</span>
+ button to confirm.
diff --git a/wiki/src/doc/first_steps/reset/mac.pt.po b/wiki/src/doc/first_steps/reset/mac.pt.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.pt.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<strong>You might overwrite any hard disk on the computer.</strong> If at "
+"some\n"
+"point you are not sure about which device to choose, stop proceeding.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+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. 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 list of storage devices, verify that the device corresponds to the "
+"device that you want to reset, its brand, its size, etc."
+msgstr ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/windows.de.po b/wiki/src/doc/first_steps/reset/windows.de.po
index 36a16b6..050545d 100644
--- a/wiki/src/doc/first_steps/reset/windows.de.po
+++ b/wiki/src/doc/first_steps/reset/windows.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-26 17:25+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails localization <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
@@ -75,8 +75,8 @@ msgstr ""
msgid ""
"Click on the <span class=\"button\">Start</span> button, and choose <span "
"class=\"menuchoice\">All Programs&nbsp;▸ Accessories&nbsp;▸ Command Prompt</"
-"span>, to open the <span class=\"application\">[[!wikipedia Command "
-"Prompt]]</span>,"
+"span>, to open the <span class=\"application\">[[!wikipedia Command Prompt]]"
+"</span>,"
msgstr ""
"Klicken Sie auf die <span class=\"button\">Start</span> Schaltfläche und "
"wählen Sie <span class=\"menuchoice\">Alle Programme&nbsp;▸ Zubehör&nbsp;▸ "
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index 6dc3ed9..591e09e 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 20:54+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-02 15:20-0000\n"
"Last-Translator: spriver <spriver@autistici.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"
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index 2919501..c81300f 100644
--- a/wiki/src/doc/first_steps/startup_options.fr.po
+++ b/wiki/src/doc/first_steps/startup_options.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 20:54+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-02 11:21-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"
@@ -227,9 +228,6 @@ msgstr "[[Usurpation d'adresse Mac|mac_spoofing]]"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " - [[Network configuration|network_configuration]]\n"
-#| " - [[Tor bridge mode|bridge_mode]]\n"
msgid ""
" - [[Network configuration|network_configuration]]\n"
" - [[Tor bridge mode|bridge_mode]]\n"
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
index 89c344d..0637412 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-03 01:59+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-02 11:23-0000\n"
"Last-Translator: \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"
diff --git a/wiki/src/doc/first_steps/upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index dad232a..a41c532 100644
--- a/wiki/src/doc/first_steps/upgrade.fr.po
+++ b/wiki/src/doc/first_steps/upgrade.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-05-09 06:26+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-04 11:08+0200\n"
"Last-Translator: saegor <saegor@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"
diff --git a/wiki/src/doc/first_steps/upgrade.release_notes.de.po b/wiki/src/doc/first_steps/upgrade.release_notes.de.po
index 3b5a5b7..bed93f9 100644
--- a/wiki/src/doc/first_steps/upgrade.release_notes.de.po
+++ b/wiki/src/doc/first_steps/upgrade.release_notes.de.po
@@ -6,25 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-30 11:24+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-30 12:32+0100\n"
"Last-Translator: spriver <spriver@autistici.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"
"X-Generator: Poedit 1.5.4\n"
-#. Note for translators: make sure that the translation of this string
-#. integrates well with /inc/stable_i386_release_notes.
+#. Note for translators: make sure that the translation of this string
+#. integrates well with /inc/stable_i386_release_notes.
#. type: Content of: outside any tag (error?)
msgid ""
"We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes"
"\" raw=\"yes\"]] for the latest version. They document all the changes in "
"this new version:"
msgstr ""
-"Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes."
-"de\" raw=\"yes\"]] für die neueste Version zu lesen. Sie beschreiben alle "
+"Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de"
+"\" raw=\"yes\"]] für die neueste Version zu lesen. Sie beschreiben alle "
"Änderungen in dieser neuen Version:"
#. type: Content of: <ul><li>
diff --git a/wiki/src/doc/introduction.de.po b/wiki/src/doc/introduction.de.po
index b2bc37d..23efd78 100644
--- a/wiki/src/doc/introduction.de.po
+++ b/wiki/src/doc/introduction.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2014-04-26 10:50+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-04-30 20:08+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/sensitive_documents/graphics.fr.po b/wiki/src/doc/sensitive_documents/graphics.fr.po
index 75d5525..0434bbc 100644
--- a/wiki/src/doc/sensitive_documents/graphics.fr.po
+++ b/wiki/src/doc/sensitive_documents/graphics.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-10-08 14:34-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,6 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/sensitive_documents/metadata.fr.po b/wiki/src/doc/sensitive_documents/metadata.fr.po
index 6639651..ca01905 100644
--- a/wiki/src/doc/sensitive_documents/metadata.fr.po
+++ b/wiki/src/doc/sensitive_documents/metadata.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-31 15:59-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/sensitive_documents/office_suite.fr.po b/wiki/src/doc/sensitive_documents/office_suite.fr.po
index 036fbf8..861af5f 100644
--- a/wiki/src/doc/sensitive_documents/office_suite.fr.po
+++ b/wiki/src/doc/sensitive_documents/office_suite.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-07-17 17:07+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,6 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/sensitive_documents/sound_and_video.fr.po b/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
index 459187c..ebf4406 100644
--- a/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
+++ b/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2012-09-09 10:13-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,6 +96,5 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/download.html b/wiki/src/download.html
index 8aae122..84cca7a 100644
--- a/wiki/src/download.html
+++ b/wiki/src/download.html
@@ -252,3 +252,4 @@ share it without restriction.</strong>
</div>
</div> <!-- #download -->
+
diff --git a/wiki/src/support/faq.de.po b/wiki/src/support/faq.de.po
index 42334d5..5d9dacc 100644
--- a/wiki/src/support/faq.de.po
+++ b/wiki/src/support/faq.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+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"
@@ -380,7 +380,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -547,6 +547,25 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr ""
diff --git a/wiki/src/support/faq.fr.po b/wiki/src/support/faq.fr.po
index d2d3553..18360fe 100644
--- a/wiki/src/support/faq.fr.po
+++ b/wiki/src/support/faq.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+0300\n"
"PO-Revision-Date: 2015-06-03 22:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,7 +455,7 @@ msgstr "Est-ce que Java est installé dans le <span class=\"application\">Tor Br
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -667,6 +667,27 @@ msgid ""
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"add-ons\"></a>\n"
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr "<a id=\"add-ons\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Can I install other add-ons in <span class=\"application\">Tor Browser</span>?\n"
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr "Puis-je installer d'autres extensions dans le <span class=\"application\">navigateur Tor</span> ?\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr "<a id=\"flash\"></a>\n"
diff --git a/wiki/src/support/faq.mdwn b/wiki/src/support/faq.mdwn
index b49aa3c..b5bd023 100644
--- a/wiki/src/support/faq.mdwn
+++ b/wiki/src/support/faq.mdwn
@@ -177,7 +177,7 @@ that does *not* behave like Tails should. Follow the
Should I update Tails using `apt-get` or <span class="application">Synaptic</span>?
-----------------------------------------------------------------------------------
-No. Tails provides upgrades every 6 weeks, that are thoroughly tested
+No. Tails provides upgrades every six weeks, that are thoroughly tested
to make sure that no security feature or configuration gets broken.
If you upgrade the system yourself using `apt-get` or <span class="application">Synaptic</span>,
you might break things. Upgrading when you get a notification from
@@ -266,6 +266,16 @@ XXX: Push that information to the browser documentation?
XXX: Check https://www.torproject.org/torbutton/torbutton-faq.html.en#recommendedextensions
-->
+<a id="add-ons update"></a>
+
+Should I manually update add-ons included in <span class="application">Tor Browser</span>?
+------------------------------------------------------------------------------------------
+
+No. Tails provides upgrades every six weeks, that are thoroughly tested
+to make sure that no security feature or configuration gets broken.
+Updating add-ons in <span class="application">Tor Browser</span> might
+break the security built in Tails.
+
<a id="flash"></a>
Can I view websites using Adobe Flash with Tails?
diff --git a/wiki/src/support/faq.pt.po b/wiki/src/support/faq.pt.po
index 0d9ae9d..d5830f9 100644
--- a/wiki/src/support/faq.pt.po
+++ b/wiki/src/support/faq.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+0300\n"
"PO-Revision-Date: 2015-06-03 22:55+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,7 +455,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -679,6 +679,27 @@ msgstr ""
"-->\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"add-ons\"></a>\n"
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr "<a id=\"add-ons\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Can I install other add-ons in the browser?\n"
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr "Posso instalar outras extensões no navegador?\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr "<a id=\"flash\"></a>\n"