Refresh website PO files.

ff59d730 · anonym · 1ccda6a0 · ff59d730 · ff59d730 · ff59d730
Commit ff59d730 authored Jan 27, 2016 by anonym
29 changed files
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">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_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+"  - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+"  - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
 "  - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
 "    - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
 "  - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"

--- 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 <translation5@451f.org>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -19,44 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.4-dev\n"

-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Connecting_to_the_network_with_NetworkManager|"
-"anonymous_internet/networkmanager]]"
-msgstr ""
-"[[!traillink اتصال_به_شبکه_با_ابزار_مدیریت_شبکه|anonymous_internet/"
-"networkmanager]]"
-
-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Logging_in_to_captive_portals|anonymous_internet/"
-"unsafe_browser]]"
-msgstr ""
-"[[!traillink ورود_به_پورتال‌های_کپتیو|anonymous_internet/unsafe_browser]]"
-
-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Controlling_Tor_using_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
-"span>|anonymous_internet/vidalia]]"
-
-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
-"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_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+"  - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+"  - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
 "  - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
 "    - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
 "  - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|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_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink کنترل_تور_با_استفاده_از_<span_class=\"application\">ویدالیا</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink وب‌گردی_با_<span_class=\"application\">مرورگر_تور</span>|"
+#~ "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_<span_class=\"application"
 #~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"

--- 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 <LL@li.org>\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_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
-
-#. type: Bullet: '  - '
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</"
-"span>|anonymous_internet/tor_browser]]"
-msgstr ""
-"[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
-"\">Tor_Browser</span>|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_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
+#| "    - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+#| "  - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|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_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+"  - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+"  - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
 "  - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
 "    - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
 "  - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|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_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Contrôler_Tor_grâce_à_Vidalia|anonymous_internet/vidalia]]"
+
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
+#~ msgstr ""
+#~ "[[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application"
+#~ "\">Tor_Browser</span>|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_<span_class=\"application"
 #~ "\">Claws_Mail</span>|anonymous_internet/claws_mail]]"

--- 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 <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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_<span_class=\"application\">Vidalia</"
-"span>|anonymous_internet/vidalia]]"
-msgstr ""
-"[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</span>|"
-"anonymous_internet/vidalia]]"
-
-#. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
-#| "tor_browser]]"
-msgid ""
-"[[!traillink Browsing_the_web_with_<span_class=\"application\">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_<span_class=\"application\">Vidalia</span>|anonymous_internet/vidalia]]\n"
+"  - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+"  - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
 "  - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
 "    - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
 "  - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|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_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+#~ msgstr ""
+#~ "[[!traillink Controlando_Tor_com_<span_class=\"application\">Vidalia</"
+#~ "span>|anonymous_internet/vidalia]]"
+
+#, fuzzy
+#~| msgid ""
+#~| "[[!traillink Browsing_the_web_with_Tor_Browser|anonymous_internet/"
+#~| "tor_browser]]"
+#~ msgid ""
+#~ "[[!traillink Browsing_the_web_with_<span_class=\"application"
+#~ "\">Tor_Browser</span>|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/"

--- 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 <spriver@autistici.org>\n"
 "Language-Team: Tails Translations <tails-l10n@boum.org>\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 ""
-"<span class=\"application\">NetworkManager</span> 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 <span class=\"application\">Netzwerk-Manager</span> 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, <span class=\"application"
-"\">NetworkManager</span> automatically connects to it."
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, <span class=\"application"
+#| "\">NetworkManager</span> 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 <span "
 "class=\"application\">Netzwerk-Manager</span> 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 <span class=\"application"
-"\">NetworkManager Applet</span> to see the list of available connections. "
-"Then select the one you want to connect to."
+"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
+"\">Select Network</span>."
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid "To connect to a mobile broadband network:"
+msgstr ""
+
+#. type: Bullet: '    1. '
+msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
 msgstr ""
-"Um sich mit einem Drahtlosnetzwerk zu verbinden, klicken Sie auf das <span "
-"class=\"application\">Netzwerk-Manager-Applet</span> 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"
+#| "     <span class=\"application\">[[Vidalia]]</span> 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"
 "     <span class=\"application\">[[Vidalia]]</span> are automatically started.\n"
+msgstr ""
+"  a. Falls Sie bereits Internetzugriff haben, werden Tor und\n"
+"     <span class=\"application\">[[Vidalia]]</span> 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"
+#| "     <span class=\"application\">[[Vidalia]]</span> 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"
-"<span class=\"application\">NetworkManager Applet</span>\n"
-"and choose <span class=\"guimenu\">Edit Connections...</span>\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 <span class=\"application\">Netzwerk-Manager-Applet</span>\n"
-"und wählen Sie <span class=\"guimenu\">Verbindungen bearbeiten...</span> 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 <span class=\"guilabel\">Network</span>."
+msgstr ""

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you want to reuse your custom <span class=\"application\">NetworkManager</span>\n"
+#| "configuration or the passwords of encrypted wireless connections across separate\n"
+#| "working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+#| "feature|first_steps/persistence/configure#network_connections]].\n"
 msgid ""
-"If you want to reuse your custom <span class=\"application\">NetworkManager</span>\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 [[<span class=\"guilabel\">Network connections</span> persistence\n"
 "feature|first_steps/persistence/configure#network_connections]].\n"
@@ -132,12 +161,22 @@ msgstr "<div class=\"note\">\n"

 #. type: Plain text
 #, no-wrap
+msgid "<p>It is currently impossible to connect using:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
 msgid ""
 "<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
-"modems. See [[!tails_ticket 5913]].</li>\n"
-"<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-"corresponding FAQ.|support/faq#vpn]]</li>\n"
+"<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
 "</ul>\n"
 msgstr ""
 "<ul>\n"
@@ -153,12 +192,55 @@ msgid "</div>\n"
 msgstr "</div>\n"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
+#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
 msgid ""
-"For more information about <span class=\"application\">NetworkManager</span>, open\n"
+"For more information, open\n"
 "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
 "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
 msgstr ""
 "Für mehr Informationen über den <span class=\"application\">Netzwerk-Manager</span> öffnen\n"
 "Sie bitte die <span class=\"application\">[[GNOME Hilfe|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
 "und wählen Sie <span class=\"guilabel\">Netzwerk, Web, E-Mail & Chat</span>.\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 ""
+#~ "<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
+#~ "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
+#~ msgstr ""
+#~ "Der <span class=\"application\">Netzwerk-Manager</span> 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 <span class="
+#~ "\"application\">NetworkManager Applet</span> 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 "
+#~ "<span class=\"application\">Netzwerk-Manager-Applet</span> 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"
+#~ "<span class=\"application\">NetworkManager Applet</span>\n"
+#~ "and choose <span class=\"guimenu\">Edit Connections...</span>\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 <span class=\"application\">Netzwerk-Manager-Applet</span>\n"
+#~ "und wählen Sie <span class=\"guimenu\">Verbindungen bearbeiten...</span> aus.\n"
--- 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"