diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index 1eabf78426045185d8b9b36e6338288785b5eeaf..223583ccea21965d2c60849d19a5199800c6cec0 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -15,37 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_Vidalia"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Tor_Browser"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr ""
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_Vidalia|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_Icedove_(Thunderbird)|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_Claws_Mail_to_Icedove|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_Electrum|anonymous_internet/electrum]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fa.po b/wiki/src/doc/anonymous_internet.index.fa.po
index 51ea311d935c6bda15871c29fb948d7ffcec91ed..4d56aa4663d61a2a15de82832467c9125f6340e7 100644
--- a/wiki/src/doc/anonymous_internet.index.fa.po
+++ b/wiki/src/doc/anonymous_internet.index.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-25 17:46+0000\n"
"Last-Translator: sprint5 \n"
"Language-Team: Persian Vidalia"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink کنترل_تور_با_استفاده_از_ویدالیا"
-"span>|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Tor_Browser"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink وبگردی_با_مرورگر_تور|"
-"anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_Vidalia|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_Icedove_(Thunderbird)|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_Claws_Mail_to_Icedove|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_Electrum|anonymous_internet/electrum]]\n"
@@ -64,6 +34,37 @@ msgid ""
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
+#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink ورود_به_پورتالهای_کپتیو|anonymous_internet/unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_Vidalia"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink کنترل_تور_با_استفاده_از_ویدالیا"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink وبگردی_با_مرورگر_تور|"
+#~ "anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink گفتگوی_آنلاین_با_پیجین_و_OTR|anonymous_internet/pidgin]]"
+
#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_Claws_Mail|anonymous_internet/claws_mail]]"
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 1f70ba00399cb3c01c295e8996300ba3ce41ef0a..8c178b74e0a0117bdb56bdeabe54274e24893e79 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-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE \n"
@@ -16,44 +16,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Se_connecter_au_réseau_avec_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_Vidalia"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Browsing_the_web_with_Tor_Browser"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Naviguer_sur_le_web_avec_le_Tor_Browser|anonymous_internet/tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!traillink Emailing_with_Icedove_(Thunderbird)|anonymous_internet/icedove]]\n"
+#| " - [[!traillink Migrating_from_Claws_Mail_to_Icedove|anonymous_internet/claws_mail_to_icedove]]\n"
+#| " - [[!traillink Exchange_bitcoins_using_Electrum|anonymous_internet/electrum]]\n"
+#| " - [[!traillink Using_I2P|anonymous_internet/i2p]]\n"
+#| " - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_Vidalia|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_Icedove_(Thunderbird)|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_Claws_Mail_to_Icedove|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_Electrum|anonymous_internet/electrum]]\n"
@@ -66,6 +42,36 @@ msgstr ""
" - [[!traillink Utiliser_I2P|anonymous_internet/i2p]]\n"
" - [[!traillink Pourquoi_Tor_est-il_lent_?|anonymous_internet/why_tor_is_slow]]\n"
+#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Se_connecter_au_réseau_avec_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_Vidalia"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Naviguer_sur_le_web_avec_le_Tor_Browser|anonymous_internet/tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
#~ msgid ""
#~ "[[!traillink Reading_and_writing_emails_with_Claws_Mail|anonymous_internet/claws_mail]]"
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index 25651e92fbd2213d06e9aac1caee10b73d949ddd..ea1ccab74029f5add4cdf4d0beab6bd4aa6c5811 100644
--- a/wiki/src/doc/anonymous_internet.index.pt.po
+++ b/wiki/src/doc/anonymous_internet.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-05-23 13:58-0300\n"
"Last-Translator: Tails Developers \n"
"Language-Team: LANGUAGE \n"
@@ -15,49 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
-"unsafe_browser]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink Controlling_Tor_using_Vidalia"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Controlando_Tor_com_Vidalia|"
-"anonymous_internet/vidalia]]"
-
-#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
-#| "tor_browser]]"
-msgid ""
-"[[!traillink Browsing_the_web_with_Tor_Browser"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
-"tor_browser]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-msgstr "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
-
#. type: Plain text
#, no-wrap
msgid ""
+" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Controlling_Tor_using_Vidalia|anonymous_internet/vidalia]]\n"
+" - [[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_Icedove_(Thunderbird)|anonymous_internet/icedove]]\n"
" - [[!traillink Migrating_from_Claws_Mail_to_Icedove|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Exchange_bitcoins_using_Electrum|anonymous_internet/electrum]]\n"
@@ -65,6 +30,42 @@ msgid ""
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
+#~ msgid ""
+#~ "[[!traillink Connecting_to_the_network_with_NetworkManager|"
+#~ "anonymous_internet/networkmanager]]"
+#~ msgstr ""
+#~ "[[!traillink Conectando_à_rede_com_o_NetworkManager|anonymous_internet/"
+#~ "networkmanager]]"
+
+#~ msgid ""
+#~ "[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
+#~ "unsafe_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Autenticando-se_em_portais_captivos|anonymous_internet/"
+#~ "unsafe_browser]]"
+
+#~ msgid ""
+#~ "[[!traillink Controlling_Tor_using_Vidalia"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Controlando_Tor_com_Vidalia"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
+#~| "tor_browser]]"
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Navegando_na_internet_com_Tor_Browser|anonymous_internet/"
+#~ "tor_browser]]"
+
+#~ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+#~ msgstr ""
+#~ "[[!traillink Batendo_papo_com_Pidgin_&_OTR|anonymous_internet/pidgin]]"
+
#, fuzzy
#~| msgid ""
#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.de.po b/wiki/src/doc/anonymous_internet/networkmanager.de.po
index 9b51e09aa0aea6bc4e1e14d4bdbbef334c43e3f5..db23d9dd75b47329ca2fe790c83fb741bc3c40d1 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.de.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-05-30 22:42+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-30 22:40+0100\n"
"Last-Translator: spriver \n"
"Language-Team: Tails Translations \n"
@@ -17,67 +17,90 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Eine Netzwerkverbindung mit dem Netzwerk-Manager herstellen\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
-"NetworkManager allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"Der Netzwerk-Manager erlaubt es Ihnen, sich kabelgebunden\n"
-"oder drahtlos (W-LAN, 3G oder GSM) mit einem Netzwerk zu verbinden:\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, NetworkManager automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, NetworkManager automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Wenn eine kabelgebundene Verbindung vorhanden ist, verbindet sich der Netzwerk-Manager automatisch mit dieser."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the NetworkManager Applet to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose Wi-Fi and then Select Network."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose Mobile Broadband."
msgstr ""
-"Um sich mit einem Drahtlosnetzwerk zu verbinden, klicken Sie auf das Netzwerk-Manager-Applet um die Liste der "
-"verfügbaren Verbindungen zu sehen. Wählen Sie anschließend die aus, mit der "
-"Sie sich verbinden möchten."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
msgid "After establishing a connection to a network:"
msgstr "Nachdem eine Verbindung mit einem Netzwerk hergestellt wurde:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" [[Vidalia]] are automatically started.\n"
+msgstr ""
+" a. Falls Sie bereits Internetzugriff haben, werden Tor und\n"
+" [[Vidalia]] automatisch gestartet.\n"
+" b. Falls Sie sich in ein Captive Portal einloggen müssen, bevor Ihnen Zugang\n"
+" zum Internet gewährt wird, [[lesen Sie die zugehörige Dokumentation|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -87,24 +110,30 @@ msgstr ""
" zum Internet gewährt wird, [[lesen Sie die zugehörige Dokumentation|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"NetworkManager Applet\n"
-"and choose \n"
-msgstr ""
-"Sie können die Einstellungen jeder einzelnen erfassten\n"
-"Netzwerkverbindung ändern (zum Beispiel um einzustellen,\n"
-"ob automatisch eine Verbindung zu einem W-LAN hergestellt werden soll).\n"
-"Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Netzwerk-Manager-Applet\n"
-"und wählen Sie aus.\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose Network."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom NetworkManager\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[Network connections persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom NetworkManager\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[Network connections persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -132,12 +161,22 @@ msgstr "\n"
#. type: Plain text
#, no-wrap
+msgid "
It is currently impossible to connect using:
\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| "- NetworkManager does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].
\n"
+#| "- It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]
\n"
+#| "
\n"
msgid ""
"
\n"
-"- NetworkManager does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].
\n"
-"- It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]
\n"
+"- Dial-up modems, see [[!tails_ticket 5913]].
\n"
+"- VPNs, see [[the corresponding FAQ|support/faq#vpn]].
\n"
"
\n"
msgstr ""
"
\n"
@@ -153,12 +192,55 @@ msgid "
\n"
msgstr "\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about NetworkManager, open\n"
+#| "[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
+#| "and choose Networking, web, email & chat.\n"
msgid ""
-"For more information about NetworkManager, open\n"
+"For more information, open\n"
"[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"and choose Networking, web, email & chat.\n"
msgstr ""
"Für mehr Informationen über den Netzwerk-Manager öffnen\n"
"Sie bitte die [[GNOME Hilfe|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"und wählen Sie Netzwerk, Web, E-Mail & Chat.\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "NetworkManager allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "Der Netzwerk-Manager erlaubt es Ihnen, sich kabelgebunden\n"
+#~ "oder drahtlos (W-LAN, 3G oder GSM) mit einem Netzwerk zu verbinden:\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the NetworkManager Applet to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Um sich mit einem Drahtlosnetzwerk zu verbinden, klicken Sie auf das "
+#~ "Netzwerk-Manager-Applet um die Liste "
+#~ "der verfügbaren Verbindungen zu sehen. Wählen Sie anschließend die aus, "
+#~ "mit der Sie sich verbinden möchten."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "NetworkManager Applet\n"
+#~ "and choose \n"
+#~ msgstr ""
+#~ "Sie können die Einstellungen jeder einzelnen erfassten\n"
+#~ "Netzwerkverbindung ändern (zum Beispiel um einzustellen,\n"
+#~ "ob automatisch eine Verbindung zu einem W-LAN hergestellt werden soll).\n"
+#~ "Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Netzwerk-Manager-Applet\n"
+#~ "und wählen Sie aus.\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fa.po b/wiki/src/doc/anonymous_internet/networkmanager.fa.po
index fcdcf036efbe44db49401559524cd7cd8b992fa7..6b1bfd288f159ae9a98c600242fba643962aceac 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fa.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fa.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-07-28 09:54+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-14 19:26+0000\n"
"Last-Translator: sprint5 \n"
-"Language-Team: Persian "
-"\n"
+"Language-Team: Persian \n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,135 +20,137 @@ msgstr ""
"X-Generator: Weblate 2.4-dev\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"متصل شدن به شبکه با استفاده از NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png "
-"link=no]]\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"idle.png link=no]]\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png "
-"link=no]]\n"
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, NetworkManager automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"wired.png link=no]]\n"
+"اگر یک اتصال باسیم شناسایی شود، NetworkManager"
+"span> به طور خودکار به آن متصل میشود."
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!img "
-"first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png "
-"link=no]]\n"
+#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
msgstr ""
-"[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
-"wireless.png link=no]]\n"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"NetworkManager allows you to connect to "
-"a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
msgstr ""
-"ابزار NetworkManager\n"
-"به شما اجازه میدهد با کمک یک اتصال بیسیم (وایفای، ۳جی یا جیاسام) یا "
-"باسیم به اینترنت وصل شوید:\n"
-#. type: Bullet: ' - '
+#. type: Bullet: ' 1. '
msgid ""
-"If a wired connection is detected, NetworkManager automatically connects to it."
+"Choose Wi-Fi and then Select Network."
msgstr ""
-"اگر یک اتصال باسیم شناسایی شود، NetworkManager به طور خودکار به آن متصل میشود."
#. type: Bullet: ' - '
-msgid ""
-"To connect to a wireless connection, click on the NetworkManager Applet to see the list of "
-"available connections. Then select the one you want to connect to."
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose Mobile Broadband."
msgstr ""
-"برای وصل شدن به یک اتصال بیسیم، روی برنامک "
-"NetworkManager کلیک کنید تا فهرست اتصالهای موجود را ببینید. سپس "
-"اتصالی که قصد وصل شدن به آن دارید را انتخاب کنید."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
msgid "After establishing a connection to a network:"
msgstr "پس از برقراری اتصال به شبکه:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
-" [[Vidalia]] are automatically "
-"started.\n"
-" b. If you need to log in to a captive portal before being granted access "
-"to\n"
-" the Internet, then [[see the corresponding "
-"documentation|unsafe_browser]].\n"
+" [[Vidalia]] are automatically started.\n"
msgstr ""
" الف. اگر امکان دسترسی به اینترنت دارید پس تور و \n"
-" [[ویدالیا]] خودکار راهاندازی "
-"شدهاند.\n"
-" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو "
-"پورتال شوید،\n"
+" [[ویدالیا]] خودکار راهاندازی شدهاند.\n"
+" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو پورتال شوید،\n"
" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"NetworkManager Applet\n"
-"and choose \n"
-msgstr ""
-"میتوانید تنظیمات هر کدام از اتصالات ذخیرهشدهٔ شبکه را تغییر دهید\n"
-"(برای مثال برای این که ببینید میخواهید خودکار به یک شبکهٔ وایفای وصل شوید "
-"یا نه).\n"
-"برای این کار روی برنامک NetworkManager\n"
-"کلیک و را انتخاب کنید.\n"
+" b. If you need to log in to a captive portal before being granted access to\n"
+" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgstr ""
+" الف. اگر امکان دسترسی به اینترنت دارید پس تور و \n"
+" [[ویدالیا]] خودکار راهاندازی شدهاند.\n"
+" ب. اگر پیش از این اجازه یافتن برای دسترسی اینترنت باید وارد یک کپتیو پورتال شوید،\n"
+" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"If you want to reuse your custom NetworkManager\n"
-"configuration or the passwords of encrypted wireless connections across "
-"separate\n"
-"working sessions, you can activate the [[Network "
-"connections persistence\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose Network."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom NetworkManager\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[Network connections persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
+msgid ""
+"If you want to reuse your custom\n"
+"configuration or the passwords of encrypted wireless connections across separate\n"
+"working sessions, you can activate the [[Network connections persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
msgstr ""
-"اگر قصد استفادهٔ دوباره از تنظیمات اختصاصی NetworkManager خود\n"
-"یا گذرواژههای رمزگذاریشدهٔ اتصالات بیسیم را در نشستهای کاری مختلف دارید، "
-"میتوانید \n"
+"اگر قصد استفادهٔ دوباره از تنظیمات اختصاصی NetworkManager خود\n"
+"یا گذرواژههای رمزگذاریشدهٔ اتصالات بیسیم را در نشستهای کاری مختلف دارید، میتوانید \n"
"[[ویژگی اتصالات شبکه \n"
-"مانا|first_steps/persistence/configure#network_connections]] را انتخاب کنید."
-"\n"
+"مانا|first_steps/persistence/configure#network_connections]] را انتخاب کنید.\n"
#. type: Plain text
msgid ""
"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network "
-"fingerprinting|doc/about/fingerprint]]."
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
msgstr ""
"اگر نگران شناختهشدن به عنوان یک کاربر تیلز روی شبکهٔ خود هستید، سند ما راجع "
"به [[اثر انگشت در شبکه|doc/about/fingerprint]] را بخوانید."
@@ -160,20 +162,28 @@ msgstr "\n"
#. type: Plain text
#, no-wrap
+msgid "
It is currently impossible to connect using:
\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| "- NetworkManager does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].
\n"
+#| "- It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]
\n"
+#| "
\n"
msgid ""
"
\n"
-"- NetworkManager does not support "
-"dial-up\n"
-"modems. See [[!tails_ticket 5913]].
\n"
-"- It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]
\n"
+"- Dial-up modems, see [[!tails_ticket 5913]].
\n"
+"- VPNs, see [[the corresponding FAQ|support/faq#vpn]].
\n"
"
\n"
msgstr ""
"
\n"
"- NetworkManager از مودمهای دایالآپ\n"
"پشتیبانی نمیکند. رجوع کنید به [[!tails_ticket 5913]].
\n"
-"- در حال حاضر در تیلز امکان استفاده از ویپیان وجود ندارد. [[سوالات "
-"متداول\n"
+"
- در حال حاضر در تیلز امکان استفاده از ویپیان وجود ندارد. [[سوالات متداول\n"
"در این زمینه را ببینید.|support/faq#vpn]]
\n"
"
\n"
@@ -183,18 +193,53 @@ msgid "
\n"
msgstr "\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about NetworkManager, open\n"
+#| "[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
+#| "and choose Networking, web, email & chat.\n"
msgid ""
-"For more information about NetworkManager, open\n"
-"[[GNOME "
-"Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
+"For more information, open\n"
+"[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"and choose Networking, web, email & chat.\n"
msgstr ""
-"برای کسب اطلاعات بیشتر در مورد NetworkManager، \n"
-"[[کمک "
-"گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]] "
-"را باز کرده و\n"
-"شبکه، وب، رایانه و گفتگوهای آنلاین را انتخاب "
-"کنید.\n"
+"برای کسب اطلاعات بیشتر در مورد NetworkManager، \n"
+"[[کمک گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]] را باز کرده و\n"
+"شبکه، وب، رایانه و گفتگوهای آنلاین را انتخاب کنید.\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "NetworkManager allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "ابزار NetworkManager\n"
+#~ "به شما اجازه میدهد با کمک یک اتصال بیسیم (وایفای، ۳جی یا جیاسام) یا باسیم به اینترنت وصل شوید:\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the NetworkManager Applet to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "برای وصل شدن به یک اتصال بیسیم، روی برنامک "
+#~ "NetworkManager کلیک کنید تا فهرست اتصالهای موجود را ببینید. سپس "
+#~ "اتصالی که قصد وصل شدن به آن دارید را انتخاب کنید."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "NetworkManager Applet\n"
+#~ "and choose \n"
+#~ msgstr ""
+#~ "میتوانید تنظیمات هر کدام از اتصالات ذخیرهشدهٔ شبکه را تغییر دهید\n"
+#~ "(برای مثال برای این که ببینید میخواهید خودکار به یک شبکهٔ وایفای وصل شوید یا نه).\n"
+#~ "برای این کار روی برنامک NetworkManager\n"
+#~ "کلیک و را انتخاب کنید.\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fr.po b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
index 3a34c716bcf989802ab68ecbfcb4f8f0cb403b4f..2e19d63e0b5e56563de37821e9971904ae6f9989 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fr.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-28 21:22+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-31 16:13-0000\n"
"Last-Translator: amnesia \n"
"Language-Team: LANGUAGE \n"
@@ -17,56 +17,60 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Se connecter au réseau avec NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
-"NetworkManager allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"NetworkManager vous permet de vous connecter\n"
-"à un réseau en utilisant une connexion filaire ou sans-fil (Wi-Fi, 3G, ou GSM) :\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, NetworkManager automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, NetworkManager automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Si une connexion filaire est détectée, NetworkManager s'y connecte automatiquement."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the NetworkManager Applet to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose Wi-Fi and then Select Network."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose Mobile Broadband."
msgstr ""
-"Pour se connecter à une connexion sans-fil, cliquer sur l'Applet NetworkManager pour voir la liste des "
-"connexions disponibles. Choisir ensuite celle à laquelle vous voulez vous "
-"connecter."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
msgstr ""
#. type: Plain text
@@ -74,10 +78,29 @@ msgid "After establishing a connection to a network:"
msgstr "Après établissement d'une connexion à un réseau :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" [[Vidalia]] are automatically started.\n"
+msgstr ""
+" a. Si vous pouvez déjà accéder à Internet, Tor et\n"
+" [[Vidalia]] démarrent automatiquement.\n"
+" b. Si vous avez besoin de vous identifier à un portail captif afin d'obtenir accès à Internet,\n"
+" alors [[voir notre documentation correspondante|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -87,24 +110,30 @@ msgstr ""
" alors [[voir notre documentation correspondante|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"NetworkManager Applet\n"
-"and choose \n"
-msgstr ""
-"Vous pouvez modifier les paramètres de chaque connexion\n"
-"réseau enregistrée (par exemple pour choisir de se connecter automatiquement\n"
-"ou non à un réseau Wi-Fi). Pour cela, faire clique-droit sur\n"
-"l'Applet NetworkManager et\n"
-"choisir \n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose Network."
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom NetworkManager\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[Network connections persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom NetworkManager\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[Network connections persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -131,12 +160,22 @@ msgstr "\n"
#. type: Plain text
#, no-wrap
+msgid "
It is currently impossible to connect using:
\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| "- NetworkManager does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].
\n"
+#| "- It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]
\n"
+#| "
\n"
msgid ""
"
\n"
-"- NetworkManager does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].
\n"
-"- It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]
\n"
+"- Dial-up modems, see [[!tails_ticket 5913]].
\n"
+"- VPNs, see [[the corresponding FAQ|support/faq#vpn]].
\n"
"
\n"
msgstr ""
"
\n"
@@ -152,9 +191,13 @@ msgid "
\n"
msgstr "\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about NetworkManager, open\n"
+#| "[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
+#| "and choose Networking, web, email & chat.\n"
msgid ""
-"For more information about NetworkManager, open\n"
+"For more information, open\n"
"[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"and choose Networking, web, email & chat.\n"
msgstr ""
@@ -162,6 +205,42 @@ msgstr ""
"[[l'aide de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"et choisir Réseau, Web, courriel & chat.\n"
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "NetworkManager allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "NetworkManager vous permet de vous connecter\n"
+#~ "à un réseau en utilisant une connexion filaire ou sans-fil (Wi-Fi, 3G, ou GSM) :\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the NetworkManager Applet to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Pour se connecter à une connexion sans-fil, cliquer sur l'Applet NetworkManager pour voir la liste des "
+#~ "connexions disponibles. Choisir ensuite celle à laquelle vous voulez vous "
+#~ "connecter."
+
+#~ msgid ""
+#~ "You can modify the settings of each recorded\n"
+#~ "network connection (for example to configure whether or not to\n"
+#~ "automatically connect to a Wi-Fi network). To do so, right-click on the\n"
+#~ "NetworkManager Applet\n"
+#~ "and choose \n"
+#~ msgstr ""
+#~ "Vous pouvez modifier les paramètres de chaque connexion\n"
+#~ "réseau enregistrée (par exemple pour choisir de se connecter automatiquement\n"
+#~ "ou non à un réseau Wi-Fi). Pour cela, faire clique-droit sur\n"
+#~ "l'Applet NetworkManager et\n"
+#~ "choisir \n"
+
#~ msgid ""
#~ "The name is quite self-explanatory – this is what you should use to "
#~ "manage your network, which usually only consists of establishing an "
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.pt.po b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
index 32d51f7de3b10939c7720e808a5d6caf102c2cc7..691439088573eb78426a4583c94c71a6f9af5250 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.pt.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-29 20:20+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-08-26 15:44-0300\n"
"Last-Translator: Tails Developers \n"
"Language-Team: LANGUAGE \n"
@@ -16,59 +16,61 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Conectando à rede com o NetworkManager\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "NetworkManager allows you to connect to a local\n"
-#| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgid ""
-"NetworkManager allows you to connect to a\n"
-"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
-"O NetworkManager permite que você conecte a\n"
-"uma rede local usando conexão com ou sem fio (Wi-Fi, 3G, ou GSM):\n"
#. type: Bullet: ' - '
-msgid ""
-"If a wired connection is detected, NetworkManager automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, NetworkManager automatically connects to it."
+msgid "If a wired connection is detected, Tails automatically connects to it."
msgstr ""
"Se uma conexão com fio é detectada, o NetworkManager conecta automaticamente a ela."
#. type: Bullet: ' - '
+msgid "To connect to a Wi-Fi network:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Bullet: ' 1. '
msgid ""
-"To connect to a wireless connection, click on the NetworkManager Applet to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose Wi-Fi and then Select Network."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "Choose Mobile Broadband."
msgstr ""
-"Para conectar a uma conexão sem fio, clique no Miniaplicativo NetworkManager para ver uma lista de conexões "
-"disponíveis. A seguir, selecione a conexão à qual você quer conectar."
#. type: Plain text
-#, no-wrap
-msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
-msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"To connect to Tor using bridges or configure a proxy to access the Internet, "
+"you need to [[activate additional Tor configuration when starting Tails|"
+"first_steps/startup_options/network_configuration]]."
+msgstr ""
#. type: Plain text
#, fuzzy
@@ -77,10 +79,29 @@ msgid "After establishing a connection to a network:"
msgstr "Após estabelecer uma conexão à rede local:"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgid ""
" a. If you can already access the Internet, Tor and\n"
" [[Vidalia]] are automatically started.\n"
+msgstr ""
+" a. Se você já consegue acessar a Internet, o Tor e o\n"
+" [[Vidalia]] são iniciados automaticamente.\n"
+" b. Se você precisa fazer login em um portal captivo antes de poder acessar a\n"
+" Internet, então [[veja a documentação correspondente|unsafe_browser]].\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| " a. If you can already access the Internet, Tor and\n"
+#| " [[Vidalia]] are automatically started.\n"
+#| " b. If you need to log in to a captive portal before being granted access to\n"
+#| " the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
+msgid ""
" b. If you need to log in to a captive portal before being granted access to\n"
" the Internet, then [[see the corresponding documentation|unsafe_browser]].\n"
msgstr ""
@@ -90,19 +111,30 @@ msgstr ""
" Internet, então [[veja a documentação correspondente|unsafe_browser]].\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"You can modify the settings of each recorded\n"
-"network connection (for example to configure whether or not to\n"
-"automatically connect to a Wi-Fi network). To do so, right-click on the\n"
-"NetworkManager Applet\n"
-"and choose \n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose Network."
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom NetworkManager\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[Network connections persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
msgid ""
-"If you want to reuse your custom NetworkManager\n"
+"If you want to reuse your custom\n"
"configuration or the passwords of encrypted wireless connections across separate\n"
"working sessions, you can activate the [[Network connections persistence\n"
"feature|first_steps/persistence/configure#network_connections]].\n"
@@ -134,12 +166,22 @@ msgstr "\n"
#. type: Plain text
#, no-wrap
+msgid "
It is currently impossible to connect using:
\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| "- NetworkManager does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].
\n"
+#| "- It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]
\n"
+#| "
\n"
msgid ""
"
\n"
-"- NetworkManager does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].
\n"
-"- It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]
\n"
+"- Dial-up modems, see [[!tails_ticket 5913]].
\n"
+"- VPNs, see [[the corresponding FAQ|support/faq#vpn]].
\n"
"
\n"
msgstr ""
"
\n"
@@ -157,11 +199,40 @@ msgstr "
\n"
#. type: Plain text
#, no-wrap
msgid ""
-"For more information about NetworkManager, open\n"
+"For more information, open\n"
"[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]\n"
"and choose Networking, web, email & chat.\n"
msgstr ""
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]\n"
+
+#~ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "NetworkManager allows you to connect to a local\n"
+#~| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgid ""
+#~ "NetworkManager allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "O NetworkManager permite que você conecte a\n"
+#~ "uma rede local usando conexão com ou sem fio (Wi-Fi, 3G, ou GSM):\n"
+
+#~ msgid ""
+#~ "To connect to a wireless connection, click on the NetworkManager Applet to see the list of available "
+#~ "connections. Then select the one you want to connect to."
+#~ msgstr ""
+#~ "Para conectar a uma conexão sem fio, clique no Miniaplicativo NetworkManager para ver uma lista de conexões "
+#~ "disponíveis. A seguir, selecione a conexão à qual você quer conectar."
+
+#~ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
+#~ msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
+
#~ msgid ""
#~ "The name is quite self-explanatory – this is what you should use to "
#~ "manage your network, which usually only consists of establishing an "
diff --git a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
index b68f71b0bc6c675d604484f7955b822543a1ca59..af3836cf7eef64015fe4a799dbd2e525fd3b7ed8 100644
--- a/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
+++ b/wiki/src/doc/encryption_and_privacy/truecrypt.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2014-12-04 17:21+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2016-01-23 13:52+0100\n"
"Last-Translator: Tails translators \n"
"Language-Team: Tails translators \n"
@@ -138,8 +138,9 @@ msgstr ""
" anders:\n"
#. type: Plain text
-#, no-wrap
-msgid " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
+#, fuzzy, no-wrap
+#| msgid " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
+msgid " cryptsetup open --type tcrypt /media/amnesia/mydisk/mycontainer myvolume\n"
msgstr " cryptsetup open --type tcrypt /media/mydisk/mycontainer myvolume\n"
#. type: Plain text
@@ -183,8 +184,9 @@ msgstr ""
"mit dem im dritten Schritt gewählten Namen."
#. type: Plain text
-#, no-wrap
-msgid " mkdir /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mkdir /media/[name]\n"
+msgid " mkdir /media/amnesia/[name]\n"
msgstr " mkdir /media/[name]\n"
#. type: Plain text
@@ -193,8 +195,9 @@ msgid " a. And, if your volume contains a **NTFS or FAT file system** (default
msgstr " a. Und wenn Ihr Laufwerk ein **NTFS or FAT Dateisystem** enthält (Standard):\n"
#. type: Plain text
-#, no-wrap
-msgid " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
+msgid " mount -o uid=1000 /dev/mapper/[name] /media/amnesia/[name]\n"
msgstr " mount -o uid=1000 /dev/mapper/[name] /media/[name]\n"
#. type: Plain text
@@ -203,8 +206,9 @@ msgid " a. Else, if your volume contains an **Ext2, Ext3, or Ext4 file system*
msgstr " a. Oder wenn Ihr Laufwerk ein **Ext2, Ext3, or Ext4 Dateisystem** enthält:\n"
#. type: Plain text
-#, no-wrap
-msgid " mount /dev/mapper/[name] /media/[name]\n"
+#, fuzzy, no-wrap
+#| msgid " mount /dev/mapper/[name] /media/[name]\n"
+msgid " mount /dev/mapper/[name] /media/amnesia/[name]\n"
msgstr " mount /dev/mapper/[name] /media/[name]\n"
#. type: Bullet: '1. '
@@ -227,9 +231,12 @@ msgstr ""
"zugeordneten Namen, den Sie im dritten Schritt ausgewählt haben."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " umount /media/[name]\n"
+#| " cryptsetup close [name]\n"
msgid ""
-" umount /media/[name]\n"
+" umount /media/amnesia/[name]\n"
" cryptsetup close [name]\n"
msgstr ""
" umount /media/[name]\n"
diff --git a/wiki/src/doc/first_steps/accessibility.de.po b/wiki/src/doc/first_steps/accessibility.de.po
index 1109bfbc70583d235e0001a9f989421fd736ee19..efd4326febf3f64a82355c2867abdacf838769d0 100644
--- a/wiki/src/doc/first_steps/accessibility.de.po
+++ b/wiki/src/doc/first_steps/accessibility.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-05-24 21:43+0100\n"
"Last-Translator: spriver \n"
"Language-Team: Tails Translation Team \n"
@@ -37,14 +37,21 @@ msgstr ""
"org/users/gnome-help/stable/a11y.html.de) Handbuch beschrieben ist."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| ".\n"
msgid ""
"To access those utilities choose\n"
".\n"
msgstr ""
"Um auf diese Werkzeuge zuzugreifen wählen Sie\n"
diff --git a/wiki/src/doc/first_steps/accessibility.fa.po b/wiki/src/doc/first_steps/accessibility.fa.po
index 697fa36ca59a3ebee759f82c3d14ec96b1f73b66..70ab84f0a84a2f9394a31321552f00541eb5eb7d 100644
--- a/wiki/src/doc/first_steps/accessibility.fa.po
+++ b/wiki/src/doc/first_steps/accessibility.fa.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-09-26 10:31+0200\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-16 14:37+0000\n"
"Last-Translator: sprint5 \n"
-"Language-Team: Persian "
-"\n"
+"Language-Team: Persian \n"
"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,19 +35,26 @@ msgid ""
"[GNOME Universal access](https://help.gnome.org/users/gnome-help/stable/a11y."
"html) guide."
msgstr ""
-"همانطور که در راهنمای [دسترسی همگانی گنوم](https://help.gnome.org/users"
-"/gnome-help/stable/a11y.html.fa) آمده، دسکتاپ گنوم ویژگیهای دسترسیپذیری "
+"همانطور که در راهنمای [دسترسی همگانی گنوم](https://help.gnome.org/users/"
+"gnome-help/stable/a11y.html.fa) آمده، دسکتاپ گنوم ویژگیهای دسترسیپذیری "
"بسیاری ارائه میکند."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| ".\n"
msgid ""
"To access those utilities choose\n"
".\n"
msgstr ""
"برای دسترسی به این ابزار\n"
@@ -114,8 +121,7 @@ msgstr ""
"ابزار روخوانی صفحه گنوم\n"
"اورکا نه با نصبکننده تیلز\n"
"کار میکند و نه با \n"
-"مرورگر غیرامن وب و مرورگر I2P.
."
-"\n"
+"مرورگر غیرامن وب و مرورگر I2P.
.\n"
#. type: Plain text
#, no-wrap
@@ -136,14 +142,12 @@ msgid ""
msgstr ""
"اگر **ترجیح میدهید از یک ابزار اشارهای به جای صفحهکلید استفاده کنید**\n"
"میتوانید [[فلورنس virtual\n"
-"keyboard|first_steps/introduction_to_gnome_and_the_tails_desktop#florence]] "
-"را به کار ببندید.\n"
+"keyboard|first_steps/introduction_to_gnome_and_the_tails_desktop#florence]] را به کار ببندید.\n"
#. type: Title =
#, no-wrap
msgid "Dasher graphical text entry application\n"
-msgstr ""
-"ابزار گرافیکی وارد کردن متنِ Dasher\n"
+msgstr "ابزار گرافیکی وارد کردن متنِ Dasher\n"
#. type: Plain text
#, no-wrap
@@ -154,10 +158,8 @@ msgid ""
"entry application.\n"
msgstr ""
"اگر تنها **با یک دست** (با دستهٔ بازی یا صفحهٔ لمسی و یا\n"
-"موشواره) یا **بدون دست** (با موشواره سر یا ابزار ردیاب نگاه) از رایانه "
-"استفاده میکنید، میتوانید\n"
-"ابزار گرافیکی پیشبینی متن را [Dasher](http://www.inference.phy.cam.ac.uk/dasher/)\n"
+"موشواره) یا **بدون دست** (با موشواره سر یا ابزار ردیاب نگاه) از رایانه استفاده میکنید، میتوانید\n"
+"ابزار گرافیکی پیشبینی متن را [Dasher](http://www.inference.phy.cam.ac.uk/dasher/)\n"
" به کار ببندید.\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/accessibility.fr.po b/wiki/src/doc/first_steps/accessibility.fr.po
index b9756dbf53005b7dd616c46ba3fdcd13d46951e9..7cd0c94d4f9ae3d61bec6130df92657d6d78e9d4 100644
--- a/wiki/src/doc/first_steps/accessibility.fr.po
+++ b/wiki/src/doc/first_steps/accessibility.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-19 00:52+0100\n"
"Last-Translator: AtomiKe \n"
"Language-Team: LANGUAGE \n"
@@ -37,14 +37,21 @@ msgstr ""
"users/gnome-help/stable/a11y.html.fr)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| ".\n"
msgid ""
"To access those utilities choose\n"
".\n"
msgstr ""
"Pour accéder à ces utilitaires, choississez\n"
diff --git a/wiki/src/doc/first_steps/accessibility.pt.po b/wiki/src/doc/first_steps/accessibility.pt.po
index 79df2a243464437f98860e83224e630f1094b4b0..7d73e1ec4d390b104e05f664694721bf59af96c8 100644
--- a/wiki/src/doc/first_steps/accessibility.pt.po
+++ b/wiki/src/doc/first_steps/accessibility.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-01 16:55+0300\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2014-07-31 14:37-0300\n"
"Last-Translator: Tails Developers \n"
"Language-Team: LANGUAGE \n"
@@ -36,14 +36,21 @@ msgstr ""
"org/users/gnome-help/stable/a11y.html.pt_BR)."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To access those utilities choose\n"
+#| ".\n"
msgid ""
"To access those utilities choose\n"
".\n"
msgstr ""
"Para acessar estes utilitários, escolha\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index 31fa3d11951e698b0db1c8562239eb57a5ec8562..59aad7d3371e0160a8aa4bef8ddf433beef45133 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-11 10:58+0100\n"
"Last-Translator: Tails translators \n"
"Language-Team: Tails translators \n"
@@ -22,23 +22,21 @@ msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
msgstr "[[!meta title=\"Einführung in GNOME und den Tails Desktop\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
+#| "version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-"
+#| "help/3.4/fallback-mode.html.en)."
msgid ""
"The desktop environment used in Tails is [GNOME](https://www.gnome.org), "
-"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
-"fallback-mode.html.en)."
+"more precisely [GNOME Classic](https://help.gnome.org/users/gnome-help/"
+"stable/gnome-classic.html) version 3.14. This page describes some important "
+"features of the desktop in the context of Tails."
msgstr ""
"Tails verwendet als Desktopumgebung [GNOME](https://www.gnome.org) in "
"Version 3.4 im [Ausweichmodus](https://help.gnome.org/users/gnome-help/3.4/"
"fallback-mode.html.de)."
-#. type: Plain text
-msgid ""
-"This page describes some important features of the desktop in the context of "
-"Tails."
-msgstr ""
-"Diese Seite beschreibt einige wichtige Funktionen des Desktops im Bezug auf "
-"Tails."
-
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
@@ -61,6 +59,12 @@ msgstr "das -Menü"
msgid "the menu"
msgstr "das -Menü"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
+
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
@@ -96,12 +100,20 @@ msgid "[[!img help-browser.png link=no]]\n"
msgstr "[[!img help-browser.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| " : to access the GNOME Desktop Help choose\n"
+#| " \n"
+#| "
\n"
+#| "\n"
msgid ""
"\n"
-" : to access the GNOME Desktop Help choose\n"
+" : to access the GNOME Desktop Help choose\n"
" \n"
"
\n"
"\n"
@@ -114,52 +126,24 @@ msgstr ""
" \n"
"\n"
-#. type: Title ###
-#, no-wrap
-msgid "System Tools submenu"
-msgstr "Systemwerkzeuge-Untermenü"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The submenu allows you to customize\n"
-"the GNOME desktop or the system.\n"
-msgstr ""
-"Das -Untermenü erlaubt es Ihnen,\n"
-"den GNOME-Desktop oder das System anzupassen.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "\n"
-msgstr "
\n"
-
-#. type: Plain text
-msgid ""
-"By default, any such customization is reset when shutting down Tails. Read "
-"the documentation on [[persistence|persistence]] to learn which "
-"configuration can be made persistent across separate working sessions."
-msgstr ""
-"Standardmäßig werden alle diese Konfigurationen beim Herunterfahren von "
-"Tails zurückgesetzt. Lesen Sie die Dokumentation zum [[beständigen "
-"Speicherbereich|persistence]], um zu erfahren, welche Konfigurationen über "
-"mehrere Arbeitssitzungen hinweg dauerhaft gesichert werden können."
-
-#. type: Plain text
-#, no-wrap
-msgid "
\n"
-msgstr "
\n"
-
-#. type: Plain text
-msgid "Among other utilities, it includes:"
-msgstr "Zusammen mit anderen Werkzeugen enthält es:"
-
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
msgstr "[[!img preferences-system.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| " :\n"
+#| " to change various system settings such as keyboard, mouse and touchpad,\n"
+#| " or displays choose\n"
+#| " \n"
+#| "
\n"
+#| "\n"
msgid ""
"\n"
" :\n"
@@ -167,8 +151,7 @@ msgid ""
" or displays choose\n"
" \n"
+" \n"
"
\n"
"\n"
msgstr ""
@@ -183,20 +166,65 @@ msgstr ""
" \n"
"\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "
\n"
+msgstr "
\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"
To learn about the many keyboard shortcuts in GNOME, click on\n"
+"Keyboard from the System\n"
+"Settings and open the Shortcuts\n"
+"tab.
\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "
\n"
+msgstr "
\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "
\n"
+msgstr "
\n"
+
+#. type: Plain text
+msgid ""
+"By default, any such customization is reset when shutting down Tails. Read "
+"the documentation on [[persistence|persistence]] to learn which "
+"configuration can be made persistent across separate working sessions."
+msgstr ""
+"Standardmäßig werden alle diese Konfigurationen beim Herunterfahren von "
+"Tails zurückgesetzt. Lesen Sie die Dokumentation zum [[beständigen "
+"Speicherbereich|persistence]], um zu erfahren, welche Konfigurationen über "
+"mehrere Arbeitssitzungen hinweg dauerhaft gesichert werden können."
+
#. type: Plain text
#, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
msgstr "[[!img seahorse.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| " :\n"
+#| " to manage your OpenPGP keys choose\n"
+#| " \n"
+#| "
\n"
+#| "
\n"
msgid ""
"
\n"
" :\n"
" to manage your OpenPGP keys choose\n"
" \n"
"
\n"
"
\n"
@@ -212,82 +240,23 @@ msgstr ""
"
\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img synaptic.png link=no]]\n"
-msgstr "[[!img synaptic.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"\n"
-" :\n"
-" to install, remove, and upgrade software packages choose\n"
-" \n"
-"
\n"
-"\n"
-msgstr ""
-"\n"
-" :\n"
-" um Softwarepakete zu installieren, entfernen oder zu aktualisieren, wählen Sie\n"
-" \n"
-"
\n"
-"\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Places menu\n"
-msgstr "Orte-Menü\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"The menu provides direct access to different\n"
-"storage media.\n"
-msgstr ""
-"Das -Menü bietet Ihnen direkten Zugang zu verschiedenen\n"
-"Speichermedien.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To connect to a remote FTP or SFTP server choose\n"
-"\n"
-msgstr ""
-"Um sich mit einem FTP oder SFTP Server zu verbinden, wählen Sie\n"
-"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "\n"
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
msgstr "\n"
-#. type: Title -
+#. type: Title ###
#, no-wrap
-msgid "Applications shortcuts\n"
-msgstr "Anwendungsverknüpfungen\n"
+msgid "Favorites submenu"
+msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "On the right of these two menu entries, a few shortcuts allow to launch the most frequently used applications."
msgid ""
-"On the right of these two menu entries, a few shortcuts allow to launch the "
-"most frequently used applications."
-msgstr ""
-"Auf der rechten Seite dieser beiden Menüeinträge ermöglichen Ihnen ein paar "
-"Verknüpfungen, die am meisten verwendeten Anwendungen zu starten."
+"In the submenu, a few\n"
+"shortcuts allow you to launch the most frequently used applications:\n"
+msgstr "Auf der rechten Seite dieser beiden Menüeinträge ermöglichen Ihnen ein paar Verknüpfungen, die am meisten verwendeten Anwendungen zu starten."
#. type: Plain text
#, no-wrap
@@ -398,45 +367,56 @@ msgstr ""
"GNOME Terminal: Verwenden Sie die Befehlszeile
\n"
"\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
+
#. type: Title -
#, no-wrap
-msgid "Notification area\n"
-msgstr "Benachrichtigungsbereich\n"
+msgid "Places menu\n"
+msgstr "Orte-Menü\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The menu provides direct access to different\n"
+#| "storage media.\n"
msgid ""
-"In the upper right corner you will find a couple of icons, each of which "
-"offers an interface for some system feature or running application. You are "
-"encouraged to check these icons out with the left and right mouse buttons."
+"The menu provides direct access to different\n"
+"folders and storage media.\n"
msgstr ""
-"In der rechten oberen Ecke werden Sie einige Symbole finden, von denen jedes "
-"eine Bedienoberfläche für einige Systemfunktionen oder laufende Programme "
-"bietet. Wir ermutigen Sie, diese Symbole mit der linken und rechten "
-"Maustaste zu erkunden."
+"Das -Menü bietet Ihnen direkten Zugang zu verschiedenen\n"
+"Speichermedien.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img tor-on.png link=no]]\n"
-msgstr "[[!img tor-on.png link=no]]\n"
+msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img tor-starting.png link=no]]\n"
-msgstr "[[!img tor-starting.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img tor-off.png link=no]]\n"
-msgstr "[[!img tor-off.png link=no]]\n"
+msgid "Tor controller\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "Vidalia: graphical controller for Tor
\n"
+#| "[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
+#| "
\n"
+#| "\n"
msgid ""
-"\n"
-"Vidalia: graphical controller for Tor
\n"
-"[[See the corresponding documentation|anonymous_internet/vidalia]]\n"
-"
\n"
-"\n"
+"Vidalia is a graphical controller for\n"
+"Tor. [[See the corresponding documentation.|anonymous_internet/vidalia]]\n"
msgstr ""
"\n"
"Vidalia: Grafische Steuerung für Tor
\n"
@@ -445,27 +425,36 @@ msgstr ""
"
\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"\n"
-"\n"
-msgstr ""
-"
\n"
-"
\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img vidalia.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img florence.png link=no]]\n"
-msgstr "[[!img florence.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "
\n"
+msgid "
\n"
+msgstr "
\n"
#. type: Plain text
#, no-wrap
msgid ""
-"
\n"
-"Florence: virtual keyboard
\n"
-"[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
-"
\n"
-"
\n"
+"Virtual keyboard\n"
+"-----------------\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "
\n"
+#| "Florence: virtual keyboard
\n"
+#| "[[See the corresponding documentation|encryption_and_privacy/virtual_keyboard]]\n"
+#| "
\n"
+#| "
\n"
+msgid ""
+"The Florence virtual keyboard can\n"
+"protect you against a hardware keylogger when typing passwords and sensitive text.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/virtual_keyboard]]\n"
msgstr ""
"\n"
"Florence: Bildschirmstastatur
\n"
@@ -474,27 +463,33 @@ msgstr ""
"
\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr "[[!img gpgApplet-text.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img florence.png link=no]]\n"
+msgid "[[!img florence.png link=no alt=\"Vidalia\"]]\n"
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr "[[!img gpgApplet.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
-#. type: Plain text
+#. type: Title -
#, no-wrap
-msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+msgid "OpenPGP applet\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Tails OpenPGP Applet: encryption and decrypt the\n"
+#| "clipboard using OpenPGP
[[See the corresponding\n"
+#| "documentation|encryption_and_privacy/gpgapplet]]
\n"
+#| "\n"
msgid ""
-"Tails OpenPGP Applet: encryption and decrypt the\n"
-"clipboard using OpenPGP
[[See the corresponding\n"
-"documentation|encryption_and_privacy/gpgapplet]]
\n"
-"\n"
+"Using the Tails OpenPGP Applet you can\n"
+"encrypt and decrypt the clipboard using OpenPGP.\n"
+"[[See the corresponding documentation.|encryption_and_privacy/gpgapplet]]\n"
msgstr ""
"Tails OpenPGP-Applet: Verschlüsseln und entschlüsseln\n"
"Sie die Zwischenablage mit OpenPGP
[[Lesen Sie die entsprechende\n"
@@ -502,178 +497,128 @@ msgstr ""
"
\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"\n"
-"\n"
-msgstr ""
-"
\n"
-"
\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img openpgp_applet.png link=no alt=\"Tails OpenPGP Applet\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "
\n"
+msgid "
\n"
+msgstr "
\n"
+
+#. type: Title -
#, no-wrap
-msgid "[[!img sound.png link=no]]\n"
-msgstr "[[!img sound.png link=no]]\n"
+msgid "Accessibility tools\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"
Audio Volume: control the audio\n"
-"volume
\n"
-"
\n"
+"The accessibility tools allow you to activate the screen reader, large text "
+"display, and other accessibility features."
msgstr ""
-"
Tonlautstärke: Steuern Sie die\n"
-"Lautstärke vom Ton
\n"
-"
\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img power.png link=no]]\n"
-msgstr "[[!img power.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img accessibility.png link=no alt=\"Accessibility tools\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
+
+#. type: Title -
#, no-wrap
-msgid ""
-"\n"
-"Power Manager: information about your battery, if you are using\n"
-"a laptop
\n"
-"
\n"
-"\n"
+msgid "Keyboard layouts\n"
msgstr ""
-"\n"
-"Energie-Manager: Informationen über Ihren Akku, wenn Sie einen Laptop\n"
-"benutzen
\n"
-"
\n"
-"\n"
#. type: Plain text
-#, no-wrap
msgid ""
-"\n"
-"\n"
+"The keyboard layout menu allow you to change the keyboard layout and input "
+"method for non-Latin scripts."
msgstr ""
-"
\n"
-"
\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-en.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img keyboard-en.png link=no]]\n"
+msgid "[[!img keyboard.png link=no alt=\"Keyboard layouts\"]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr "[[!img keyboard-de.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "
\n"
+msgid "
\n"
+msgstr "
\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "System Tools submenu"
+msgid "System menu\n"
+msgstr "Systemwerkzeuge-Untermenü"
#. type: Plain text
-#, no-wrap
msgid ""
-"
\n"
-"Keyboard Layout: current keyboard layout
\n"
-"Right-click to configure a different keyboard layout.
\n"
-"
\n"
+"In the top-right corner of the top bar, the system menu allows you to manage "
+"your systems settings and your computer."
msgstr ""
-"
\n"
-"Tastaturlayout: Aktuelles Tastaturlayout
\n"
-"Rechtsklicken Sie, um ein anderes Tastaturlayout einzustellen.
\n"
-"
\n"
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-idle.png link=no]]\n"
-msgstr "[[!img network-idle.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
+msgid "[[!img system.png link=no alt=\"System menu\"]]\n"
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img network-wired.png link=no]]\n"
-msgstr "[[!img network-wired.png link=no]]\n"
+msgid "See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].
\n"
+msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "[[!img network-wireless.png link=no]]\n"
-msgstr "[[!img network-wireless.png link=no]]\n"
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"\n"
-"Network Manager: handle your wireless or cabled network\n"
-"connection
\n"
-"[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
-"
\n"
-"\n"
+msgid "Activities overview\n"
msgstr ""
-"\n"
-"Netzwerk-Manager: Verwalten Sie Ihre drahtlosen oder kabelgebundenen\n"
-"Netzwerkverbindungen
\n"
-"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/networkmanager]]\n"
-"
\n"
-"\n"
#. type: Plain text
-#, no-wrap
-msgid ""
-"\n"
-"\n"
+msgid "To access your windows and applications you can either:"
msgstr ""
-"
\n"
-"
\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!img shutdown.png link=no]]\n"
-msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"
System Shutdown: shut down or restart the\n"
-"system
\n"
-"
\n"
+" - Choose .\n"
+" - Throw your mouse pointer to the top-left hot corner.\n"
+" - Press the windows key on your keyboard.\n"
msgstr ""
-"
System herunterfahren: Fahren Sie das System herunter oder starten Sie es\n"
-"neu
\n"
-"
\n"
-
-#. type: Title =
-#, no-wrap
-msgid "Bottom panel\n"
-msgstr "Fußleiste\n"
#. type: Plain text
-msgid "On the left of the bottom panel are displayed buttons for open windows."
+msgid ""
+"You can see your windows and applications in the overview. You can also "
+"start typing to search your applications, files, and folders."
msgstr ""
-"Im linken Bereich der Fußleiste werden Schaltflächen für geöffnete Fenster "
-"angezeigt."
#. type: Plain text
-msgid ""
-"On the right of the bottom panel, a set of four similar rectangle icons "
-"gives access to four different workspaces."
-msgstr ""
-"Im rechten Bereich der Fußleiste sehen Sie eine Anordnung vier gleicher, "
-"rechteckiger Symbole, die Zugriff zu vier verschiedenen Arbeitsbereichen "
-"bieten."
+#, fuzzy, no-wrap
+#| msgid "\n"
+msgid "\n"
+msgstr "\n"
#. type: Title =
#, no-wrap
msgid "Desktop shortcuts\n"
msgstr "Desktopverknüpfungen\n"
-#. type: Plain text
-#, no-wrap
-msgid "[[!img computer.png link=no]]\n"
-msgstr "[[!img computer.png link=no]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Computer: access storage media
\n"
-"\n"
-msgstr ""
-"Computer: Greifen Sie auf Speichermedien zu
\n"
-"\n"
-
#. type: Plain text
#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
@@ -771,6 +716,231 @@ msgstr ""
"Dateien oder Ordner zu verschieben, können Sie sie aus einem Fenster in das "
"nächste ziehen und loslassen."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "To connect to a remote FTP or SFTP server choose\n"
+#| "\n"
+msgid ""
+"To connect to a remote FTP or SFTP server choose\n"
+"Connect to Server.\n"
+msgstr ""
+"Um sich mit einem FTP oder SFTP Server zu verbinden, wählen Sie\n"
+"\n"
+
+#~ msgid ""
+#~ "This page describes some important features of the desktop in the context "
+#~ "of Tails."
+#~ msgstr ""
+#~ "Diese Seite beschreibt einige wichtige Funktionen des Desktops im Bezug "
+#~ "auf Tails."
+
+#~ msgid ""
+#~ "The submenu allows you to customize\n"
+#~ "the GNOME desktop or the system.\n"
+#~ msgstr ""
+#~ "Das -Untermenü erlaubt es Ihnen,\n"
+#~ "den GNOME-Desktop oder das System anzupassen.\n"
+
+#~ msgid "Among other utilities, it includes:"
+#~ msgstr "Zusammen mit anderen Werkzeugen enthält es:"
+
+#~ msgid "[[!img synaptic.png link=no]]\n"
+#~ msgstr "[[!img synaptic.png link=no]]\n"
+
+#~ msgid ""
+#~ "\n"
+#~ " :\n"
+#~ " to install, remove, and upgrade software packages choose\n"
+#~ " \n"
+#~ "
\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ " :\n"
+#~ " um Softwarepakete zu installieren, entfernen oder zu aktualisieren, wählen Sie\n"
+#~ " \n"
+#~ "
\n"
+#~ "\n"
+
+#~ msgid "Applications shortcuts\n"
+#~ msgstr "Anwendungsverknüpfungen\n"
+
+#~ msgid "Notification area\n"
+#~ msgstr "Benachrichtigungsbereich\n"
+
+#~ msgid ""
+#~ "In the upper right corner you will find a couple of icons, each of which "
+#~ "offers an interface for some system feature or running application. You "
+#~ "are encouraged to check these icons out with the left and right mouse "
+#~ "buttons."
+#~ msgstr ""
+#~ "In der rechten oberen Ecke werden Sie einige Symbole finden, von denen "
+#~ "jedes eine Bedienoberfläche für einige Systemfunktionen oder laufende "
+#~ "Programme bietet. Wir ermutigen Sie, diese Symbole mit der linken und "
+#~ "rechten Maustaste zu erkunden."
+
+#~ msgid "[[!img tor-on.png link=no]]\n"
+#~ msgstr "[[!img tor-on.png link=no]]\n"
+
+#~ msgid "[[!img tor-starting.png link=no]]\n"
+#~ msgstr "[[!img tor-starting.png link=no]]\n"
+
+#~ msgid "[[!img tor-off.png link=no]]\n"
+#~ msgstr "[[!img tor-off.png link=no]]\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "
\n"
+
+#~ msgid "[[!img gpgApplet-text.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-text.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet.png link=no]]\n"
+
+#~ msgid "[[!img gpgApplet-seal.png link=no]]\n"
+#~ msgstr "[[!img gpgApplet-seal.png link=no]]\n"
+
+#~ msgid ""
+#~ "
\n"
+#~ "
\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "
\n"
+
+#~ msgid "[[!img sound.png link=no]]\n"
+#~ msgstr "[[!img sound.png link=no]]\n"
+
+#~ msgid ""
+#~ "
Audio Volume: control the audio\n"
+#~ "volume
\n"
+#~ "
\n"
+#~ msgstr ""
+#~ "
Tonlautstärke: Steuern Sie die\n"
+#~ "Lautstärke vom Ton
\n"
+#~ "
\n"
+
+#~ msgid "[[!img power.png link=no]]\n"
+#~ msgstr "[[!img power.png link=no]]\n"
+
+#~ msgid ""
+#~ "
\n"
+#~ "Power Manager: information about your battery, if you are using\n"
+#~ "a laptop
\n"
+#~ "
\n"
+#~ "
\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "Energie-Manager: Informationen über Ihren Akku, wenn Sie einen Laptop\n"
+#~ "benutzen
\n"
+#~ "
\n"
+#~ "
\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "
\n"
+
+#~ msgid "[[!img keyboard-de.png link=no]]\n"
+#~ msgstr "[[!img keyboard-de.png link=no]]\n"
+
+#~ msgid ""
+#~ "
\n"
+#~ "Keyboard Layout: current keyboard layout
\n"
+#~ "Right-click to configure a different keyboard layout.
\n"
+#~ "
\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "Tastaturlayout: Aktuelles Tastaturlayout
\n"
+#~ "Rechtsklicken Sie, um ein anderes Tastaturlayout einzustellen.
\n"
+#~ "
\n"
+
+#~ msgid "[[!img network-idle.png link=no]]\n"
+#~ msgstr "[[!img network-idle.png link=no]]\n"
+
+#~ msgid "[[!img network-wired.png link=no]]\n"
+#~ msgstr "[[!img network-wired.png link=no]]\n"
+
+#~ msgid "[[!img network-wireless.png link=no]]\n"
+#~ msgstr "[[!img network-wireless.png link=no]]\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Network Manager: handle your wireless or cabled network\n"
+#~ "connection
\n"
+#~ "[[See the corresponding documentation|anonymous_internet/networkmanager]]\n"
+#~ "
\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Netzwerk-Manager: Verwalten Sie Ihre drahtlosen oder kabelgebundenen\n"
+#~ "Netzwerkverbindungen
\n"
+#~ "[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/networkmanager]]\n"
+#~ "
\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "
\n"
+#~ "
\n"
+
+#~ msgid "[[!img shutdown.png link=no]]\n"
+#~ msgstr "[[!img shutdown.png link=no]]\n"
+
+#~ msgid ""
+#~ "
System Shutdown: shut down or restart the\n"
+#~ "system
\n"
+#~ "
\n"
+#~ msgstr ""
+#~ "
System herunterfahren: Fahren Sie das System herunter oder starten Sie es\n"
+#~ "neu
\n"
+#~ "
\n"
+
+#~ msgid "Bottom panel\n"
+#~ msgstr "Fußleiste\n"
+
+#~ msgid ""
+#~ "On the left of the bottom panel are displayed buttons for open windows."
+#~ msgstr ""
+#~ "Im linken Bereich der Fußleiste werden Schaltflächen für geöffnete "
+#~ "Fenster angezeigt."
+
+#~ msgid ""
+#~ "On the right of the bottom panel, a set of four similar rectangle icons "
+#~ "gives access to four different workspaces."
+#~ msgstr ""
+#~ "Im rechten Bereich der Fußleiste sehen Sie eine Anordnung vier gleicher, "
+#~ "rechteckiger Symbole, die Zugriff zu vier verschiedenen Arbeitsbereichen "
+#~ "bieten."
+
+#~ msgid "[[!img computer.png link=no]]\n"
+#~ msgstr "[[!img computer.png link=no]]\n"
+
+#~ msgid ""
+#~ "Computer: access storage media
\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Computer: Greifen Sie auf Speichermedien zu
\n"
+#~ "\n"
+
#~ msgid "\n"
#~ msgstr "\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
index 724ee9e9a98ed9f2e91366bd1d88d655485fe431..e07842bbff52bdb9e14c0c318201334de3ba8724 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-01-27 00:14+0100\n"
"PO-Revision-Date: 2015-10-15 07:22+0000\n"
"Last-Translator: sprint5 \n"
"Language-Team: Persian