[network-manager-applet] Updated Uyghur translation



commit f52a4d8450e7062d9fe9e39298b8de10f1b152dc
Author: Gheyret Kenji <gheyret gmail com>
Date:   Sun Jan 20 11:42:52 2013 +0900

    Updated Uyghur translation
    
    Signed-off-by: Gheyret Kenji <gheyret gmail com>

 po/ug.po | 3850 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2247 insertions(+), 1603 deletions(-)
---
diff --git a/po/ug.po b/po/ug.po
index 2663b5b..f177633 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,1537 +7,2195 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-08-26 20:51+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n";
+"POT-Creation-Date: 2013-01-15 13:02+0000\n"
 "PO-Revision-Date: 2011-08-08 15:40+0600\n"
 "Last-Translator: Sahran <sahran ug gmail com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ yahoogroups com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
+msgid "Network"
+msgstr "ØÙØ"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "ØÙØ ØØØÙÙÙÙØÙÙØÙÚÙØÙÙ ØØØÙÛØÛÚ"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "ØÙØ"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "ØÙØ ØØØÙÙÙÙØÙÙØÙ"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "ØÙÙØÙØ ØÙØ WiFi ÙÛØÛØÙÙ ØØÙØ"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "ØÙØ ØØØÙÙÙÙØ ØÛÚØÛÙÙÙØÙÚÙØÙÙ ØØØÙÛØÛÚ ÛÛ ØÛØÚÛØØÙÚ"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "ØØØÙÙÙÙØ ØÛÙØÛØÛØÙÙÙ ØØÙØ"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#| msgid ""
+#| "Set this to TRUE to disable notifications when connecting to a network."
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "ØÙØ ØÙØØØ ØØØÙÙÙÙÛØØÙØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "ØØØÙÙÙÙØ ØÛØÛÙÚÛÙÙÙÙ ØÛÙØÛØÛØÙÙÙ ØØÙØ"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr ""
-"ØÙØ ØÙØØØ ØØØÙÙÙÙÛØØÙØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ ØØÙÙØØÙÙ "
-"TRUE ØØ ØÛÚØÛÚ."
-
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#| msgid ""
+#| "Set this to TRUE to disable notifications when disconnecting from a "
+#| "network."
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
-msgstr ""
-"ØÙØ ØÙØ ØØØÙÙÙÙØÙÙÙ ØÛØÛÛØØÙØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ "
-"ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
-
-#: ../nm-applet.schemas.in.h:6
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "ØÙØ ØÙØ ØØØÙÙÙÙØÙÙÙ ØÛØÛÛØØÙØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#| msgid "Disable connected notifications"
+msgid "Disable VPN notifications"
+msgstr "Û Ù Ù(VPN) ØÛÙØÛØÛØÙÙÙ ØÙÙØÛÛØØÙØ ÙÙÙ"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#| msgid ""
+#| "Set this to TRUE to disable notifications when disconnecting from a "
+#| "network."
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
-msgstr ""
-"ØÙÙØÙØ ØÙØ ØÙØÙÛØÙÙÙÙ ØÙÙØØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ "
-"ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Û Ù Ù(VPN) ØÙØÙØØ  ØØØÙÙÙÙÛØØÙØÙØØ ÙØÙÙ ØØØÙÙÙÙØ ØÛØÛÙÛÛØØÙØÙØØ ØÛÙØÛØÛØÙØØÙÙÚ ÚÙÙÙØØÙÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "ØÙØ ØÙØÙÙØÙÙÙØÚØÙ ØÛÙØÛØÛØÙÙØÙÙÙ ÚÛÙÙÛ"
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#| msgid ""
+#| "Set this to TRUE to disable notifications when wireless networks are "
+#| "available."
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"ÙÙÙÙØÙÚØÙÙØØÙÙ ØÙØÙÛØÙÛÙØÛ adhoc ØÙØÙÙØÙÙÙ ÙÛØÙØØÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ "
-"ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "ØØÙØØ"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "ØÙØ ØÙØÙÙØÙÙÙØÚØÙ ØÛÙØÛØÛØÙÙØÙÙÙ ÚÛÙÙÛ"
-
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
-msgstr ""
-"ØÛÚØÛÙÙÛØÙÙÚ ÙÛÚÙ ØÙØ ÙÛØØÙØØ ÙÛÚÛØ-ÙÛÚÛØÙÛØÙÙÙÙÙ ØÛÙÚÙÙÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
+msgstr "ØÛÚØÛÙÙÛØÙÙÚ ÙÛÚÙ ØÙØ ÙÛØØÙØØ ÙÛÚÛØ-ÙÛÚÛØÙÛØÙÙÙÙÙ ØÛÙÚÙÙÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "ØÙØ ØØØÙÙÙÙØ ØÛÚØÛÙÙÙØÙÚÙØÙÙ ØØØÙÛØÛÚ ÛÛ ØÛØÚÛØØÙÚ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr "ØÙÙØÙØ ØÙØ WiFi ÙÛØÛØÙÙ ØØÙØ"
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "ØÙØ ØØØÙÙÙÙØÙÙØÙ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#| msgid ""
+#| "Set to TRUE to disable creation of adhoc networks when using the applet."
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "ÙÙÙÙØÙÚØÙÙØØÙÙ ØÙØÙÛØÙÛÙØÛ adhoc ØÙØÙÙØÙÙÙ ÙÛØÙØØÙÙÙÙÙ ØÙØØÙØÙÚÙØ ØÛ ØØÙÙØØÙÙ TRUE ØØ ØÛÚØÛÚ."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "ØÙØÙÙØÙÙÙØÚØÙ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#| msgid "Choose CA Certificate"
+msgid "Ignore CA certificate"
+msgstr "CA ÚÛÛØÚÙØÙÙØÙÚÛ ÙÛØÛØ ÙÙÙÙØ"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "ØÙØ ÚØØÙØ '%s' ÚÛ ØØØÙØÙØÙÚÙØ."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "EAP ØÙÙÙ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØØÛ CA ÚÛÛØÚÙØÙÙØÙÙÙÚ ØØÚØÚÙØÙØÛØÛØÙÙØÙÙÙ ØØÙÙÙÙØÙÚÙØ ØÛÙÙ true ØØ ØÛÚØÛÚ."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "ØØØÙÙÙÙØ ØÛØØÛØÛÙØÙ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "EAP ØÙÙÙ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØÙÙÚ ØÙÙÙÙÙÚÙ ØØØÙÛÚÙØÙÙÙ CA ÚÛÛØÚÙØÙÙØÙÙÙÚ ØØÚØÚÙØÙØÛØÛØÙÙØÙÙÙ ØØÙÙÙÙØÙÚÙØ ØÛÙÙ true ØØ ØÛÚØÛÚ."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "ÚØØÙØ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#| msgid "Wired 802.1X authentication"
+msgid "802.1X authentication"
+msgstr ""
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ '%s' ØØ ØÛÙÙØØÙÙÙÙÛØØÙØÛ..."
+#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "ØÙØ ØØØÙ(_N)"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ '%s' ÙÙ ØÛÙÙÛÛØØÙØÛ..."
+#: ../src/applet.c:545
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to add/activate connection"
+msgstr "ØØØÙÙÙÙØÙÙ ÙÙØÛØ/ØØÙØÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#| msgctxt "Speed"
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
+
+#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
+#| msgid "Connection add failed"
+msgid "Connection failure"
+msgstr "ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet.c:589
+#| msgid "disconnected"
+msgid "Device disconnect failed"
+msgstr "ØÛØÙÛÙÛ ØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet.c:594
+#| msgid "Disconnected"
+msgid "Disconnect failure"
+msgstr "ØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet.c:615
+#| msgid "Connection add failed"
+msgid "Connection activation failed"
+msgstr "ØØØÙÙÙÙØÙÙ ØØÙØÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet.c:985 ../src/applet-device-wifi.c:1069
+msgid "Don't show this message again"
+msgstr "ØÛ ØÛÚÛØÙÙ ÙØÙØØ ÙÛØØÛØÙÛ"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:1074
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ '%s' ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:1077
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s' ØÛÚÛÙ ØÙØ ØÙØ ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ØÙÙÙØÙØÙ ØÙØØÙØÙ."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet.c:1080
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ"
-
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ØÙÙØÛÛØØÙØ ØÛÙÙÙÙÙÚÛ ÙØÙØØÙ."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:405
+#: ../src/applet.c:1083
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(%s)"
-
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(CDMA) ØØØÙÙÙÙØÙ..."
-
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "ÚØØÙØ CDMA ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØØØÙÙÙÙØ ÛØÙØÙ ØÛØÙÙ ÙÛØØÙ."
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:1086
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ:(%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "ÙÛØÙÛ"
-
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "CDMA ØÙØÙ."
-
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
-msgid "You are now registered on the home network."
-msgstr "ØÙØ ÚØØÙØ ØØØÙÙÛ ØÙØÙØØ ØÛØÙÛØØÙÚÙØ."
-
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
-msgid "You are now registered on a roaming network."
-msgstr "ØÙØ ÚØØÙØ ÙÛØÙÛ ØÙØØØ ØÛØÙÛØØÙÚÙØ."
-
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:456
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(GSM) ØØØÙÙÙÙØÙ..."
-
-#: ../src/applet-device-gsm.c:490
-msgid "You are now connected to the GSM network."
-msgstr "ÚØØÙØ GSM ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
-
-#: ../src/applet-device-gsm.c:651
-msgid "PIN code required"
-msgstr "PIN ÙÙØÙ ØÛÚØÙÙØØÙÙÙ"
-
-#: ../src/applet-device-gsm.c:659
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ ØÛÚÛÙ PIN ÙÙØÙ ÙÛØÛÙ"
-
-#: ../src/applet-device-gsm.c:784
-msgid "Wrong PIN code; please contact your provider."
-msgstr "ØØØØ PIN ÙÙØÙØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ØÙÙÛÙ ÙÛØÛØÛÚ."
-
-#: ../src/applet-device-gsm.c:807
-msgid "Wrong PUK code; please contact your provider."
-msgstr "ØØØØ PUK ÙÙØÙØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ØÙÙÛÙ ÙÛØÛØÛÚ."
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:834
-msgid "Sending unlock code..."
-msgstr "ÙÛÙÛÙ ØÛÚÙØ ÙÙØÙ ØÛÛÛØÙÛØØÙØÛ..."
-
-#: ../src/applet-device-gsm.c:897
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN ÙÛÙÛÙ ØÛÚÙØ ÙÛØÛÙ"
-
-#: ../src/applet-device-gsm.c:898
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN ÙÛÙÛÙ ØÛÚÙØ ÙÛØÛÙ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ÛØÙØÙØØ ØØØÙØÙÙÙØÙ."
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
+#: ../src/applet.c:1089
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ '%s' ÚÛ ØÙØÙÙØÙÙÙØØÙÙ ØÙÙÚÙØÙ ØÙØ SIM PIN ÙÙØÙ "
-"ÙÛØÛÙ."
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
-msgid "PIN code:"
-msgstr "PIN ÙÙÙÛØÙ:"
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÛØ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
-msgid "Show PIN code"
-msgstr "PIN ÙÙÙÛØÙÙÙ ÙÛØØÛØ"
+#: ../src/applet.c:1092
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØÙÙØÛÛØÙÙÙ VPN ØÙÙ ÚÛØØÛØÙÙØÙ(secret) ÙÙÙ."
 
-#: ../src/applet-device-gsm.c:909
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK ÙÛÙÛÙ ØÛÚÙØ ÙÛØÛÙ"
+#: ../src/applet.c:1095
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ØÙÙ ÚÛØØÛØÙÙØÙ(secret) ØÙÙØÛÛØØÙØ."
 
-#: ../src/applet-device-gsm.c:910
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK ÙÛÙÛÙ ØÛÚÙØ ÙÛØÛÙ"
+#: ../src/applet.c:1102
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr "\n"
+"â%sâ VPN ØØØÙÙÙÙØÙ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
+#: ../src/applet.c:1120
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ '%s' ÚÛ ØÙØÙÙØÙÙÙØØÙÙ ØÙÙÚÙØÙ ØÙØ SIM PUK ÙÙØÙ "
-"ÙÛØÛÙ."
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ØÛØÛÙÛÙ ÙØÙØÙØ ÚÛÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
-msgid "PUK code:"
-msgstr "PUK ÙÙÙÛØÙ:"
+#: ../src/applet.c:1123
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ØÛØÛÙÛÙ ÙØÙØÙØ ÚÛÙÙÙVPN ÙÛÙØØÙÙÙØÙ ØÙØØÙØÙ."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
-msgid "New PIN code:"
-msgstr "ÙÛÚÙ PUK ÙÙÙÛØÙ:"
+#: ../src/applet.c:1129
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr "\n"
+"â%sâ VPN ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
-msgid "Re-enter new PIN code:"
-msgstr "ÙÛÚÙ PUK ÙÙÙÛØÙÙÙ ÙÛÙÛ ÙÙØÚÛØÛÚ:"
+#: ../src/applet.c:1159
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr "Û Ù Ù (VPN) ØØØÙÙÙÙØÙ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØÙ.\n"
+"\n"
+"%s\n"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK ÙÙØÙÙØÙÙÙ ÙÛØØÛØ"
+#: ../src/applet.c:1161
+msgid "VPN connection has been successfully established.\n"
+msgstr "Û Ù Ù (VPN) ØØØÙÙÙÙØÙ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØÙ.\n"
 
-#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
-msgid "GSM network."
-msgstr "GSM ØÙØÙ."
+#: ../src/applet.c:1163
+msgid "VPN Login Message"
+msgstr "VPN ÙÙØÙØ ØÛÚÛØÙ"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "ØØÙØÙÙØØÙÙ Ethernet"
+#: ../src/applet.c:1169 ../src/applet.c:1177 ../src/applet.c:1227
+msgid "VPN Connection Failed"
+msgstr "VPN ØØØÙÙÙÙØÙ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../src/applet-device-wired.c:205
+#: ../src/applet.c:1234
 #, c-format
-msgid "Wired Networks (%s)"
-msgstr "ØÙÙÙÙÙ ØÙØÙØØ(%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr "\n"
+"VPN ØØØÙÙÙÙØÙ â%sâ ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÛØ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-wired.c:207
+#: ../src/applet.c:1237
 #, c-format
-msgid "Wired Network (%s)"
-msgstr "ØÙÙÙÙÙ ØÙØ (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr "\n"
+"â%sâ VPN ØØØÙÙÙÙØÙÙÙ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "ØÙÙÙÙÙ ØÙØÙØØ"
+#: ../src/applet.c:1552
+msgid "device not ready (firmware missing)"
+msgstr "ØÛØÙÛÙÛ ØÛÙÙØØÙØÙÙÙØÙ(ÙÛÙÙØ ØÛØØÙ ÙÛÙ)"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "ØÙÙÙÙÙ ØÙØ"
+#: ../src/applet.c:1554
+msgid "device not ready"
+msgstr "ØÛØÙÛÙÛ ØÛÙÙØØÙØÙÙÙØÙ"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
+#: ../src/applet.c:1564 ../src/applet-device-ethernet.c:229
 msgid "disconnected"
 msgstr "ØÛØÛÙØÙ"
 
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "ÚØØÙØ ØÙÙÙÙÙ ØÙØØØ ØØØÙØÙØÙÚÙØ."
+#: ../src/applet.c:1580
+msgid "Disconnect"
+msgstr "ØÛØ"
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "'%s' ØÙÙÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛÙÙØØÙÙÙÙÛØØÙØÛâ"
+#: ../src/applet.c:1594
+msgid "device not managed"
+msgstr "ØÛØÙÛÙÛ ØØØÙÛØÛÙÙÙØÙ"
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "'%s' ØÙÙÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛÙÙÙÙÙÛØØÙØÛâ"
+#: ../src/applet.c:1638
+msgid "No network devices available"
+msgstr "ØÙØ ØÛØÙÛÙÙØÙ ÙÙÙ"
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "ØÙÙÙÙÙ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙâ"
+#: ../src/applet.c:1726
+msgid "_VPN Connections"
+msgstr "VPN ØØØÙÙÙÙØÙÙØÙ(_V)"
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "''%s' ØÛÚÛÙ ØÙØ ØÙÙÙÙÙ ØÙØ ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛâ"
+#: ../src/applet.c:1783
+msgid "_Configure VPN..."
+msgstr "VPN ÙÙ ØÛÙÙÛ(_C)â"
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr "ØÙÙÙÙÙ ØÙØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ"
+#: ../src/applet.c:1787
+msgid "_Disconnect VPN"
+msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÛØ(_D)"
 
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL ØÛÙÙÙÙÛØ"
+#: ../src/applet.c:1881
+msgid "NetworkManager is not running..."
+msgstr "ØÙØ ØØØÙÛØØÛÚ ØÙØØØ ÙÙÙÙÙÙØÙÛØØÙØÛâ"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "ÙÙØÛØÛÙ ØÙÙØÙØ ØÙØØØ ØØØÙØÙ(_C)â"
+#: ../src/applet.c:1886 ../src/applet.c:2738
+msgid "Networking disabled"
+msgstr "ØÙØ ØØØÙÙÙÙØÙ ÚÛÙÙÛÙÚÛÙ"
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
-msgstr "ÙÛÚÙ ØÙÙØÙØ ØÙØ ÙÛØ(_N)â"
+#. 'Enable Networking' item
+#: ../src/applet.c:2107
+msgid "Enable _Networking"
+msgstr "ØÙØ ØÛÙØØÙÙ ÙÙØØØØ(_N)"
 
-#: ../src/applet-device-wifi.c:294
-msgid "(none)"
-msgstr "(ÙÙÙ)"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2116
+#| msgid "Enable _Wireless"
+msgid "Enable _Wi-Fi"
+msgstr "ØÙÙØÙØ ØÙØÙÙ(Wi-Fi) ØÙÙØÛÛØÙÙÙ ÙÙÙ(_W)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "ØÙÙØÙØ ØÙØÙØØ (%s)"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2125
+msgid "Enable _Mobile Broadband"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙ(_M)"
 
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "ØÙÙØÙØ ØÙØ (%s)"
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2134
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "WiMAX ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙ(_X)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ØÙÙØÙØ ØÙØ"
+#. Toggle notifications item
+#: ../src/applet.c:2145
+msgid "Enable N_otifications"
+msgstr "ØÛÙØÛØÛØÙØØÙÙ ÙÙØØØØ(_O)"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "ØÙÙØÙØ ØÙØ ÚÛÙÙÛÙÚÛÙ"
+#. 'Connection Information' item
+#: ../src/applet.c:2156
+msgid "Connection _Information"
+msgstr "ØØØÙÙÙÙØ ØÛÚÛØÙÙØÙ(_I)"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "ØÙÙØÙØ ØÙØ ÙØØØÙÙ ØÛØÚØØ ØÛØÙÙÙØÙÙ ÚÛÙÙÛÙÚÛÙ"
+#. 'Edit Connections...' item
+#: ../src/applet.c:2166
+msgid "Edit Connections..."
+msgstr "ØØØÙÙÙÙØÙØØÙÙ ØÛÚØÙØÙÛâ"
 
-#: ../src/applet-device-wifi.c:902
-msgid "More networks"
-msgstr "ØÛØÙÙÛ ÙÛÙ ØÙØ"
+#. Help item
+#: ../src/applet.c:2180
+msgid "_Help"
+msgstr "ÙØØØÛÙ(_H)"
+
+#. About item
+#: ../src/applet.c:2189
+msgid "_About"
+msgstr "ÚÛÙÙÙØÛ(_A)"
+
+#: ../src/applet.c:2367
+msgid "Disconnected"
+msgstr "ØÛØÛÙØÙ"
+
+#: ../src/applet.c:2368
+msgid "The network connection has been disconnected."
+msgstr "ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙÚÛÙ ØÙØÙ."
+
+#: ../src/applet.c:2601
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "â%sâ ØÙØ ØØØÙÙÙÙØÙ ØÛÙÙØØÙÙÙÙÛØØÙØÛâ"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
-msgstr "ØÙÙØÙØ ØÙØÙØØ ØÙÚÛÙ"
+#: ../src/applet.c:2604
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "ØÙØ ØØØÙÙÙÙØÙ â%sâ ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙÙÙÙâ"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "ØÙØ ØÙÙØÙØ ØÙØØØ ØØØÙÙÙÙØ ØÛÚÛÙ ØÛ ØÙÙØÛÙÚÙÙÙ ÚÛÙÙÚ"
+#: ../src/applet.c:2607 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "â%sâ ØÛÚÛÙ ØÙØ ØÙØ ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛ..."
 
-#: ../src/applet-device-wifi.c:1084
-msgid "Use the network menu to connect to a wireless network"
-msgstr "ØÙØ ØÙÙØÙØ ØÙØØØ ØØØÙÙÙÙØ ØÛÚÛÙ ØÛ ØÙØ ØÙØÙÙÙÙÙÙÙÙ ØÙØÙÙØÙÚ"
+#: ../src/applet.c:2610
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "â%sâ ØÙØ ØØØÙÙÙÙØÙ ØØÙØÙÙ"
 
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "ØÛ ØÛÚÛØÙÙ ÙØÙØØ ÙÛØØÛØÙÛ"
+#: ../src/applet.c:2693
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN ØØØÙÙÙÙØÙ â%sâ ØØØÙÙÙÙÛØØÙØÛ"
+
+#: ../src/applet.c:2696
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN ØØØÙÙÙÙØÙ â%sâ ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙÙÙÙ..."
+
+#: ../src/applet.c:2699
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "â%sâ ØÛÚÛÙ ØÙØVPN ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛ..."
+
+#: ../src/applet.c:2702
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN ØØØÙÙÙÙØÙ â%sâ ØØÙØÙÙ"
+
+#: ../src/applet.c:2743
+msgid "No network connection"
+msgstr "ØÙØ ØØØÙÙÙÙØÙ ÙÙÙ"
+
+#: ../src/applet.c:3444
+msgid "NetworkManager Applet"
+msgstr "NetworkManager ÙÙÙÙØÙÚØÙ"
+
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
+msgid "Available"
+msgstr "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÛ"
+
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
+#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "ØÙØ ÚØØÙØ â%sâ ÚÛ ØØØÙØÙØÙÚÙØ."
+
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
+#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
+msgid "Connection Established"
+msgstr "ØØØÙÙÙÙØ ØÛØØÛØÛÙØÙ"
+
+#: ../src/applet-device-bt.c:200
+msgid "You are now connected to the mobile broadband network."
+msgstr "ÚØØÙØ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
+
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:606
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ â%sâ ØØ ØÛÙÙØØÙÙÙÙÛØØÙØÛ..."
+
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:609
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ â%sâ ÙÙ ØÛÙÙÛÛØØÙØÛ..."
+
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:612
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ â%sâ ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙ..."
+
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ â%sâ ØØÙØÙÙ"
+
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(%s)"
+
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
+msgid "Mobile Broadband"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ"
+
+#. Default connection item
+#: ../src/applet-device-cdma.c:316
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(CDMA) ØØØÙÙÙÙØÙ..."
+
+#: ../src/applet-device-cdma.c:350
+msgid "You are now connected to the CDMA network."
+msgstr "ÚØØÙØ CDMA ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
+
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+msgid "CDMA network."
+msgstr "CDMA ØÙØÙ."
+
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
+#: ../src/applet-device-gsm.c:677
+msgid "You are now registered on the home network."
+msgstr "ØÙØ ÚØØÙØ ØØØÙÙÛ ØÙØÙØØ ØÛØÙÛØØÙÚÙØ."
+
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-gsm.c:683
+msgid "You are now registered on a roaming network."
+msgstr "ØÙØ ÚØØÙØ ÙÛØÙÛ ØÙØØØ ØÛØÙÛØØÙÚÙØ."
+
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "ØØÙØÙÙØØÙÙ Ethernet"
+
+#: ../src/applet-device-ethernet.c:202
+#, c-format
+#| msgid "Wired Networks (%s)"
+msgid "Ethernet Networks (%s)"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:204
+#, c-format
+#| msgid "Wired Network (%s)"
+msgid "Ethernet Network (%s)"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:207
+#| msgid "Wired Networks"
+msgid "Ethernet Networks"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:209
+#| msgid "Wired Network"
+msgid "Ethernet Network"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:271
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the ethernet network."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:297
+#, c-format
+#| msgid "Preparing wired network connection '%s'..."
+msgid "Preparing ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:300
+#, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:303
+#, c-format
+#| msgid "User authentication required for wired network connection '%s'..."
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:306
+#, c-format
+#| msgid "Requesting a wired network address for '%s'..."
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:310
+#, c-format
+#| msgid "Wired network connection '%s' active"
+msgid "Ethernet network connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:491
+msgid "DSL authentication"
+msgstr "DSL ØÛÙÙÙÙÛØ"
+
+#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+msgid "Wrong PUK code; please contact your provider."
+msgstr "ØØØØ PUK ÙÙØÙØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ØÙÙÛÙ ÙÛØÛØÛÚ."
+
+#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
+msgid "Wrong PIN code; please contact your provider."
+msgstr "ØØØØ PIN ÙÙØÙØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ØÙÙÛÙ ÙÛØÛØÛÚ."
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
+msgid "Sending unlock code..."
+msgstr "ÙÛÙÛÙØÙØÙØØ ÙÙØÙ ØÛÛÛØÙÛØØÙØÛ..."
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:780
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:816
+#| msgid "You are now connected to the mobile broadband network."
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
+#| msgid "Mobile broadband network password"
+msgid "Mobile Broadband network."
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(GSM) ØØØÙÙÙÙØÙ..."
+
+#: ../src/applet-device-gsm.c:404
+msgid "You are now connected to the GSM network."
+msgstr "ÚØØÙØ GSM ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
+
+#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
+msgid "GSM network."
+msgstr "GSM ØÙØÙ."
+
+#: ../src/applet-device-wifi.c:98
+#| msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:149
+#| msgid "Create _New Wireless Network..."
+msgid "Create _New Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:293
+msgid "(none)"
+msgstr "(ÙÙÙ)"
+
+#: ../src/applet-device-wifi.c:787
+#, c-format
+#| msgid "Wired Networks (%s)"
+msgid "Wi-Fi Networks (%s)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:789
+#, c-format
+#| msgid "Wired Network (%s)"
+msgid "Wi-Fi Network (%s)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:791
+#| msgid "Wired Network"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] ""
+
+#: ../src/applet-device-wifi.c:824
+#| msgid "WiMAX is disabled"
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:825
+#| msgid "WiMAX is disabled by hardware switch"
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:886
+msgid "More networks"
+msgstr "ØÛØÙÙÛ ÙÛÙ ØÙØ"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1065
+#| msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1066
+#| msgid "Use the network menu to connect to a wireless network"
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1260
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "ÚØØÙØ ØÙÙØÙØ ØÙØ '%s' ØØ ØØØÙØÙØÙÚÙØ."
+#| msgid "You are now connected to the wireless network '%s'."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1310
+#: ../src/applet-device-wifi.c:1291
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÙÙØØÙÙÙÙÛØØÙØÛâ"
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1313
+#: ../src/applet-device-wifi.c:1294
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÙÙÙÙÙÛØØÙØÛâ"
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1316
+#: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙÙÙÙâ"
+#| msgid "User authentication required for wireless network '%s'..."
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1319
+#: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "''%s' ØÛÚÛÙ ØÙØ ØÙÙØÙØ ØÙØ ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛâ"
+#| msgid "Requesting a network address for '%s'..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1321
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ:%s (%d%%)"
+#| msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr ""
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1326
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ"
+#| msgid "Wired network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1374
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to activate connection"
+msgstr "ØØØÙÙÙÙØÙÙ ØØÙØÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wifi.c:1393
+#| msgid "Could not edit new connection"
+msgid "Failed to add new connection"
+msgstr "ÙÛÚÙ ØØØÙÙÙÙØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/applet-device-wimax.c:227
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ(%s)"
 
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ"
 
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
 msgid "WiMAX is disabled"
 msgstr "WiMAX ÚÛÙÙÛÙÚÛÙ"
 
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX ÙØØØÙÙ ØÛØØÙ ØÛØÚØØÙ ØÛØÙÙÙØÙÙ ÚÛÙÙÛÙÚÛÙ"
 
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
 msgid "You are now connected to the WiMAX network."
 msgstr "ÚØØÙØ WiMAX ØÙØÙØØ ØØØÙØÙØÙÚÙØ."
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ â%sâ ØØÙØÙÙ:(%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
+msgid "roaming"
+msgstr "ÙÛØÙÛ"
+
+#: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "ØØØÙÙÙÙØ ØÛÚÛØÙÙØÙÙÙ ÙÛØØÛØÙÛÙØÛ ØØØØÙÙÙ ÚÙÙØÙ:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../src/applet-dialogs.c:109
+#: ../src/connection-editor/page-wifi-security.c:313
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
+#: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "ØÙÙØÙÙÙ WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
+#: ../src/applet-dialogs.c:247
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#: ../src/applet-dialogs.c:243
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
+#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ÙÙÙ"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:277
+#, c-format
+#| msgid "1 (Default)"
+msgid "%s (default)"
+msgstr "%s (ÙÛÚÛÙØÙÙÙ)"
+
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
 #, c-format
 msgid "%u Mb/s"
-msgstr "%u Mb/s"
+msgstr "%u ÙÛÚØØØÙØ/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../src/applet-dialogs.c:342
+#: ../src/applet-dialogs.c:361
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:344
+#: ../src/applet-dialogs.c:363
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:375
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:413
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:420
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:422
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:426
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "ØØØÛØØÙÙÙ"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:436
 msgid "Interface:"
 msgstr "ØØØØÙÛØ:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:452
 msgid "Hardware Address:"
 msgstr "ÙØØØÙÙ ØÛØØÙ ØØØØÛØÙ:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:460
 msgid "Driver:"
 msgstr "ÙÙØØØØÙÛÚ:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:489
 msgid "Speed:"
 msgstr "ØÛØØÛØ:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:499
 msgid "Security:"
 msgstr "ØÙØÛØÛØÙÙÙ:"
 
-#: ../src/applet-dialogs.c:493
+#: ../src/applet-dialogs.c:512
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:506
+#: ../src/applet-dialogs.c:525
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:542
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
+#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
 msgid "IP Address:"
 msgstr "IP ØØØØÛØÙ:"
 
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:569
 msgid "Broadcast Address:"
 msgstr "ØØØÙØÙ ØØØØÛØÙ:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:559
+#: ../src/applet-dialogs.c:578
 msgid "Subnet Mask:"
 msgstr "ØØØÙØÙ ØÙØ ÙØØÙÙØÙ:"
 
-#: ../src/applet-dialogs.c:561
+#: ../src/applet-dialogs.c:580
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
 msgid "Default Route:"
 msgstr "ÙÛÚÛÙØÙÙÙ Route:"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:600
 msgid "Primary DNS:"
 msgstr "ØÙØÙÙÚÙ DNS:"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:609
 msgid "Secondary DNS:"
 msgstr "ØÙÙÙÙÙÚÙ DNS:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:619
 msgid "Ternary DNS:"
 msgstr "ØÛÚÙÙÚÙ DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:634
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
+#: ../src/applet-dialogs.c:643
 msgid "Ignored"
 msgstr "ÙÛØÛØ ÙÙÙÙÙØÙ"
 
+#: ../src/applet-dialogs.c:796
+#| msgid "_Type:"
+msgid "VPN Type:"
+msgstr "VPN ØÙÙÙ:"
+
+#: ../src/applet-dialogs.c:803
+#| msgid "Gateway"
+msgid "VPN Gateway:"
+msgstr "VPN ØÛØÙÙÙÙ:"
+
+#: ../src/applet-dialogs.c:809
+#| msgid "_Username:"
+msgid "VPN Username:"
+msgstr "VPN ØÙØÙÛØÙÛÚÙ ØØØÙ:"
+
+#: ../src/applet-dialogs.c:815
+msgid "VPN Banner:"
+msgstr "VPN ÙÛÛÚÛØÙ:"
+
+#: ../src/applet-dialogs.c:821
+#| msgid "C_onnection:"
+msgid "Base Connection:"
+msgstr "ØØØØØÙÙ ØØØÙÙÙÙØ:"
+
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
+#| msgctxt "Speed"
+#| msgid "Unknown"
+msgid "Unknown"
+msgstr "ÙØÙÛÙÛÙ"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:886
 msgid "No valid active connections found!"
 msgstr "ØÙÙØÛÛØÙÙÙ ØØÙØÙÙ ØØØÙÙÙÙØÙØØ ØÛÙÙÙØÙ!"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:939
 msgid ""
 "Copyright  2004-2011 Red Hat, Inc.\n"
 "Copyright  2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
-msgstr ""
-"ÙÛØØ ÚÙÙÛÙÙØØ ØÙÚÛ Â 2004-2011 Red Hat ØÙØÙÙØÙ.\n"
+msgstr "ÙÛØØ ÚÙÙÛÙÙØØ ØÙÚÛ Â 2004-2011 Red Hat ØÙØÙÙØÙ.\n"
 "ÙÛØØ ÚÙÙÛÙÙØØ ØÙÚÛ Â 2005-2008 Novell ØÙØÙÙØÙ\n"
 "ÛÛ ØØØÙØ ØØÙØØÛØ ØÛÚÙÙÙØØÙÙØÙ ÛÛ ØÛØØÙÙØÙÙØØ"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:942
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"ØÙØ ØÛØÙÛÙÙÙÙØÙÚÙØÙÙ ÛÛ ØØØÙÙÙÙØÙØØÙÙ ØØØÙÛØÙØÙØØÙ ØÛÙØÛØÛØ ØØÙÙÙÙ ÙÙÙÙØÙÚØÙÙ"
+msgstr "ØÙØ ØÛØÙÛÙÙÙÙØÙÚÙØÙÙ ÛÛ ØØØÙÙÙÙØÙØØÙÙ ØØØÙÛØÙØÙØØÙ ØÛÙØÛØÛØ ØØÙÙÙÙ ÙÙÙÙØÙÚÙÙÙ"
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:944
 msgid "NetworkManager Website"
 msgstr "NetworkManager ØÙØ ØÛØÙ"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:959
 msgid "Missing resources"
 msgstr "ØØÙÙÙÙ ÙÛÙÚÙÙ"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:984
 msgid "Mobile broadband network password"
 msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÙØ ØÙÙÙ"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:993
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "'%s' ÙÛ ØØØÙÙÙÙØ ØÛÚÛÙ ØÙØ ØÙÙØØ ØÛÚØÙÙØØÙÙÙ."
+msgstr "â%sâ ÙÛ ØØØÙÙÙÙØ ØÛÚÛÙ ØÙØ ØÙÙØØ ØÛÚØÙÙØØÙÙÙ."
 
-#: ../src/applet-dialogs.c:858
+#: ../src/applet-dialogs.c:1012
 msgid "Password:"
 msgstr "ØÙÙ:"
 
-#: ../src/applet.c:990
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN ÙÛÙÛÙØÙØÙØØ ÙÛØÛÙ"
 
-#: ../src/applet.c:993
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ØÙÙÙØÙØÙ ØÙØØÙØÙ."
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN ÙÛÙÛÙØÙØÙØØ ÙÛØÛÙ"
 
-#: ../src/applet.c:996
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ØÙÙØÛÛØØÙØ ØÛÙÙÙÙÙÚÛ "
-"ÙØÙØØÙ."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ â%sâ ÚÛ ØÙØÙÙØÙÙÙØØÙÙ ØÙÙÚÙØÙ ØÙØ SIM PIN ÙÙØÙ ÙÛØÛÙ."
 
-#: ../src/applet.c:999
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØØØÙÙÙÙØ ÛØÙØÙ ØÛØÙÙ ÙÛØØÙ."
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN ÙÙÙÛØÙ:"
 
-#: ../src/applet.c:1002
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÙØÙ ÛØÙØÙØØ ØØØÙØÙÙÙØÙ."
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "PIN ÙÙÙÛØÙÙÙ ÙÛØØÛØ"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK ÙÛÙÛÙØÙØÙØØ ÙÛØÛÙ"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK ÙÛÙÛÙØÙØÙØØ ÙÛØÛÙ"
 
-#: ../src/applet.c:1005
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÛØ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ."
-
-#: ../src/applet.c:1008
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ ØÙÙØÛÛØÙÙÙ VPN ØÙÙ ÚÛØØÛØÙÙØÙ(secret) "
-"ÙÙÙ."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ â%sâ ÚÛ ØÙØÙÙØÙÙÙØØÙÙ ØÙÙÚÙØÙ ØÙØ SIM PUK ÙÙØÙ ÙÛØÛÙ."
 
-#: ../src/applet.c:1011
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ØÙÙ ÚÛØØÛØÙÙØÙ(secret) ØÙÙØÛÛØØÙØ."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK ÙÙÙÛØÙ:"
 
-#: ../src/applet.c:1018
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
-msgstr ""
-"\n"
-"'%s' VPN ØØØÙÙÙÙØÙ ÙÛØÙÛÙ ØÙÙØÙ."
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "ÙÛÚÙ PUK ÙÙÙÛØÙ:"
 
-#: ../src/applet.c:1036
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ØÛØÛÙÛÙ ÙØÙØÙØ ÚÛÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "ÙÛÚÙ PUK ÙÙÙÛØÙÙÙ ÙÛÙÛ ÙÙØÚÛØÛÚ:"
 
-#: ../src/applet.c:1039
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ØÛØÛÙÛÙ ÙØÙØÙØ ÚÛÙÙÙVPN ÙÛÙØØÙÙÙØÙ ØÙØØÙØÙ."
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "PIN/PUK ÙÙØÙÙØÙÙÙ ÙÛØØÛØ"
 
-#: ../src/applet.c:1045
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
-msgstr ""
-"\n"
-"'%s' VPN ØØØÙÙÙÙØÙ ØÛØÛÙØÙ."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr "IP ØØØØÛØÙÙØÙ ÙÙÙÙÙÛØÛØÙÚÙØÙÙ ØÙØØØ ÙÛØØÙØÙÙ ØÛØÙØÙØØÙ ØÛÙÚÛ. \"ÙÙØ\" ÙÛÙÛÙÙÙØÙÙÙ ÚÛÙÙÙ ØÙØ IP ØØØØÛØÙ ÙÙØÛÚ."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "VPN ÙÙØÙØ ØÛÚÛØÙ"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+msgid "Ig_nore automatically obtained routes"
+msgstr "ØØÙØÙÙØØÙÙ ØÛØÙØÙÛÙ route ÙØØÙÙ ÙÛØÛØÚÛ ØØÙÙÙØÛÙ(_N)"
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "VPN ØØØÙÙÙÙØÙ ÙÛØÙÛÙ ØÙÙØÙ"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:3
+#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#| msgid "Use this c_onnection only for resources on its network"
+msgid "_Use this connection only for resources on its network"
+msgstr "-ÙÛÙÛØ ØÛ ØÙÙ ØÛÙØÙØØÙ ØÙÙØØ ØÙØÙÙ ØÙÙØØÛØ ÙÙÙØØÙØØØ ØØÙØÙÙ ØÛ ØÙÙÙÙ ØÙØÙÙØÙØÛ."
 
-#: ../src/applet.c:1150
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:4
+#: ../src/connection-editor/ce-ip6-routes.ui.h:4
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "ÙÙØØÙØÙÙØØÙØØØ ØÛ ØØØÙÙÙÙØ ÙÛÚÚÛ ÙÛÚÛÙØÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ÙÙÙÙÙ ÙÙÙÙÙÙØÙÙØÙØÛ."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../src/connection-editor/ce-new-connection.ui.h:2
+#| msgid "Choose a VPN Connection Type"
+msgid "Choose a Connection Type"
 msgstr ""
-"\n"
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÛØÙÛÙ ØÙÙØÙ ÚÛÙÙÙ VPN ÙÛÙØØÙÙÛØ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1153
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#| msgid ""
+#| "Select the type of VPN you wish to use for the new connection.  If the "
+#| "type of VPN connection you wish to create does not appear in the list, "
+#| "you may not have the correct VPN plugin installed."
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
-"\n"
-"'%s' VPN ØØØÙÙÙÙØÙÙÙ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "ØÛØÙÛÙÛ ØÛÙÙØØÙØÙÙÙØÙ(ÙÛÙÙØ ØÛØØÙ ÙÛÙ)"
-
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "ØÛØÙÛÙÛ ØÛÙÙØØÙØÙÙÙØÙ"
-
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "ØÛØ"
-
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "ØÛØÙÛÙÛ ØØØÙÛØÛÙÙÙØÙ"
-
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "ØÙØ ØÛØÙÛÙÙØÙ ÙÙÙ"
-
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "VPN ØØØÙÙÙÙØÙÙØÙ(_V)"
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "VPN ÙÙ ØÛÙÙÛ(_C)â"
-
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÛØ(_D)"
+#: ../src/connection-editor/ce-new-connection.ui.h:6
+msgid "Createâ"
+msgstr "ÙÛØâ"
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "ØÙØ ØØØÙÛØØÛÚ ØÙØØØ ÙÙÙÙÙÙØÙÛØØÙØÛâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "ØÙØ ØØØÙÙÙÙØÙ ÚÛÙÙÛÙÚÛÙ"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "ØÙØ ØÛÙØØÙÙ ÙÙØØØØ(_N)"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "ØÙÙØÙØ ØÙØÙÙ ÙÙØØØØ(_W)"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#| msgid "Broadcast Address:"
+msgid "Broadcast"
+msgstr "ØØÚÙÙØÙØ"
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØÙÙ ÙÙØØØØ(_M)"
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØÙÙ ÙÙØØØØ(_X)"
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "ØÛÙØÛØÛØÙØØÙÙ ÙÙØØØØ(_O)"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "ØØØÙÙÙÙØ ØÛÚÛØÙÙØÙ(_I)"
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "ØØØÙÙÙÙØÙØØÙÙ ØÛÚØÙØÙÛâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#| msgid "EAP"
+msgid "ARP"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "ÙØØØÛÙ(_H)"
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#| msgid "C_onnection:"
+msgid "Bonded _connections:"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "ÚÛÙÙÙØÛ(_A)"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#| msgid "M_ode:"
+msgid "_Mode:"
+msgstr "ÚØÙÛØ(_M):"
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "ØÛØÛÙØÙ"
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "_Edit"
+msgstr "ØÛÚØÙØ(_E)"
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "ØÙØ ØØØÙÙÙÙØÙ ØÛØÛÙÚÛÙ ØÙØÙ."
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "_Delete"
+msgstr "ØÛÚÛØ(_D)"
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "'%s' ØÙØ ØØØÙÙÙÙØÙ ØÛÙÙØØÙÙÙÙÛØØÙØÛâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙÙÙÙâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr "ms"
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "'%s' ØÙØ ØØØÙÙÙÙØÙ ØØÙØÙÙ"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#| msgid "Interface:"
+msgid "_Interface name:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN ØØØÙÙÙÙØÙ '%s' ØØØÙÙÙÙÛØØÙØÛ"
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN ØØØÙÙÙÙØÙ '%s' ØÛÚÛÙ ØÙØÙÛØÙÛÚÙÙÙ ØÛÙØÛØÛØ ÙÛØÛÙÙÙÙ..."
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr ""
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "''%s' ØÛÚÛÙ ØÙØVPN ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛ..."
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ"
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr ""
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "ØÙØ ØØØÙÙÙÙØÙ ÙÙÙ"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "NetworkManager ÙÙÙÙØÙÚØÙ"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "_Unlock"
-msgstr "ÙÛÙÛÙ ØØÚ(_U)"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#| msgid "_Security:"
+msgid "_Priority:"
+msgstr "ÙÛØØÙÛÙØÙ(_P):"
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "ØØÙØÙÙ ØÙØ ØØØÙÙÙÙØÙÙØÙ"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "ØØØÙÙÙÙØ ØÛÚÛØÙÙØÙ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#| msgid "Wired connection %d"
+msgid "Bridged _connections:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "ØÙÙÙÙÙ 802.1X ÚÛÛØÚÙØÙÛ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "ØÙØ ØØØÙ(_N)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "ØØÙØÙÙØØÙÙ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "s"
 
-#: ../src/connection-editor/ce-page.c:305
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
-"ÙØÙÛÙÛÙ ØÙØ ØØØØÙÙÙ ØÛÛÛØÙÙÙ ØÛÙØØ ÙÛØÙÙÙÛØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛÚÙÙÙÙØÙÙÙØÙ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
 msgstr ""
-"IP ØØØØÛØÙÙØÙ ÙÙÙÙÙÛØÛØÙÚÙØÙÙ ØÙØØØ ÙÛØØÙØÙÙ ØÛØÙØÙØØÙ ØÛÙÚÛ. \"ÙÙØ\" "
-"ÙÛÙÛÙÙÙØÙÙÙ ÚÛÙÙÙ ØÙØ IP ØØØØÛØÙ ÙÙØÛÚ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
 msgstr ""
-"ÙÙØØÙØÙÙØØÙØØØ ØÛ ØØØÙÙÙÙØ ÙÛÚÚÛ ÙÛÚÛÙØÙÙÙ ØÙØ ØØØÙÙÙÙØÙ ÙÙÙÙÙ ÙÙÙÙÙÙØÙÙØÙØÛ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "ØØÙØÙÙØØÙÙ ØÛØÙØÙÛÙ route ÙØØÙÙ ÙÛØÛØÚÛ ØØÙÙÙØÛÙ(_N)"
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "ØØÙØÙÙØØÙÙ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
-msgstr "ØÛ ØØØÙÙÙÙØÙÙ ÙØØ ØÙØØÙÙÙ ØØÙÙÙÙÙØØ ØÛÚÛÙÙØ ÙÙÙÙØÙ(_O)"
+#: ../src/connection-editor/ce-page.c:356
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ÙØÙÛÙÛÙ ØÙØ ØØØØÙÙÙ ØÛÛÛØÙÙÙ ØÛÙØØ ÙÛØÙÙÙÛØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛÚÙÙÙÙØÙÙÙØÙ."
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 #: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "ØÙÙÙÙ ÙÛØØÛØ(_W)"
+msgid "_Username:"
+msgstr "ØÙØÙÛØÙÛÚÙ ØØØÙ(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "ØÙÙ(_P):"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "ÙÛÙØØÙÙÛØ(_S)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 #: ../src/wireless-security/ws-leap.ui.h:3
-msgid "_Username:"
-msgstr "ØÙØÙÛØÙÛÚÙ ØØØÙ(_U):"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "ØÙÙÙÙ ÙÛØØÛØ(_W)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-msgid "Addresses"
-msgstr "ØØØØÛØÙØØ"
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+msgid "_Password:"
+msgstr "ØÙÙ(_P):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "ØØÙØÙÙØØÙÙ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "ÙÙÙÙØØ ØÛÚØÛÙÚÛÙ DNS ØÛÚØÛÙÙÙØÙÙÙ ØØÙØÙÙØØÙÙ ØÙØÙÛØ"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "ÙÙØ ÙÙÙØØØÙÙ ÙÙÙÙÙÛ (TP)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "D_HCP ØØØÙÙØ ID:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "ÙÙØÛÙÙØ ØÛÙÛÙ ØØØØÙÛØÙ(AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "ÛØØÙØÛ ÙÛØØÛÙÙÙ ØØØØÙÛØÙ(MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 ÙÛÚØØØÙØ/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 ÙÛÚØØØÙØ/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 ÚÙÚØØØÙØ/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 ÚÙÚØØØÙØ/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "ØÛØÙØ(_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ØÛØØÛØ(_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "ØÙÙÛÙ ÙÙØ ØÙØÙÛØ(_X)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "ØØÙØÙÙØØÙÙ ÙÙÙ ØÛÙÙØÙØ(_O)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#: ../src/connection-editor/ce-page-wimax.ui.h:1
+msgid "_Device MAC address:"
+msgstr "ØÛØÙÛÙÛ MAC ØØØØÛØÙ(_D):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#| msgid "_Cloned MAC address:"
+msgid "C_loned MAC address:"
+msgstr "ÙÛÙÙÙÙØÙØØÙ MAC ØØØØÛØ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr "ØÛ ÙÛØÚÛ ÙÙØÚÛØÚÛÙ MAC ØØØØÛØÙ ØØØÙÙÙÙØ ÙÙØØÙØÙÙØØÙØØ ØÙØ ØÛØÙÛÙÛ ÙØØØÙÙ ØÛØØÙ ØØØØÛØ ÙÙÙÙÙ ØÙØÙÙØÙÙÙØÛ. ØÛ ØÙÙØÙØØØ MAC ÙÙÚ ÙÙÙÙÙÙ ØÛÙÙÙÙØÛ. ÙÙØØÙ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "_MTU:"
+msgstr "_MTU:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "bytes"
+msgstr "ØØÙØ"
+
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "_Automatically connect to this network when it is available"
 msgstr ""
-"ØØØ ÙØØÙÙÙÙÙÚ ØØØÙÙØÙÙÙ ÙÛØÙØÙÛ ØÙØÙÙØÙØÙØØÙ ØØØÙØÙÙÛØ. ØÙØØÙÙ ÙÛÙ "
-"ØØØÙØÙÙÛØÙÙ ÙÛØ ØÙÙÛÙ ØØÙØÙÚ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#| msgid "You are now connected to the wired network."
+msgid "All _users may connect to this network"
 msgstr ""
-"ØØØ ÙØØÙÙÙÙÙÚ ØØØÙÙØÙÙÙ ÙÛØÙØÙÛ ØÙØÙÙØÙØÙØØÙ ØØØÙØÛ ÙÛÙØØÙÙÛØÙØ(DNS)ÙÙÚ IP "
-"ØØØØÛØÙ. ØÙØØÙÙ ÙÛÙ ØØØÙØÛ ÙÛÙØØÙÙÛØÙØ ØØØØÛØÙÙÙ ÙÛØ ØÙÙÛÙ ØØÙØÙÚ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "ØÛÙØÙÙØ-ÙÛØÙÙÙ"
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "Firewall _zone:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr ""
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#| msgid "C_onnect"
+msgid "Connected"
+msgstr "ØØØÙØÙØÙ"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "ÙÙÙÙØØ ØÛÚØÛÙÚÛÙ DNS ØÛÚØÛÙÙÙØÙÙÙ ØØÙØÙÙØØÙÙ ØÙØÙÛØ"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:169
 #: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "ÙÙÙØØ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "ØÛ ØØØÙÙÙÙØÙÙ ØØÙØÙÙÙÙØÙ ØÛÚÛÙ IPv4 ØØØØÛØÙ ÙÛØÛÙÙÙÙ"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "ØÛÙØÙÙØ-ÙÛØÙÙÙ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:187
 #: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "ØØØÙØ ÙÙÙÙÙÛØÛØÙØØ ØÙÙÛÙ ÚÛÙØÛÚÙØÙÛÙÚÛÙ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+msgid "_Method:"
+msgstr "ØÛØÛÙ(_M):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Addresses"
+msgstr "ØØØØÛØÙØØ"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
 "enter it here."
-msgstr ""
-"DHCP ØØØÙÙØ ØØÙØÙØÛÚ ØÙØ ØØØÙÛØØÛÚÙÙÙÚ ÙÙÙÙÙÛØÛØÙÚÙØÙÙÚ ØÛÙÙÙÙÙØÙÙÙ "
-"ØÛØÙÛØØÛØÛØÙÚÛ ØÙØØØÛØ ØÛØÚÛÙ. DHCP ØØØÙÙØ ØØÙØÙØÛÚÙÙ ØÙØÙÙØÙØ ØÛÚÛÙ ØÛÙÙ ØÛ "
-"ÙÛØÚÛ ÙÙØÚÛØÛÚ."
+msgstr "DHCP ØØØÙÙØ ØØÙØÙØÛÚ ØÙØ ØØØÙÛØØÛÚÙÙÙÚ ÙÙÙÙÙÛØÛØÙÚÙØÙÙÚ ØÛÙÙÙÙÙØÙÙÙ ØÛØÙÛØØÛØÛØÙÚÛ ØÙØØØÛØ ØÛØÚÛÙ. DHCP ØØØÙÙØ ØØÙØÙØÛÚÙÙ ØÙØÙÙØÙØ ØÛÚÛÙ ØÛÙÙ ØÛ ÙÛØÚÛ ÙÙØÚÛØÛÚ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr ""
-"ØÛÙØÛÙÙØØÙØÙ IPv6 ØÙØÙÙØÙØØ ØØØÙØÙØØÙ ÛØÙÙØØØØ ØÛÚÛØ IPv4 ØÛÙÙÛØ ÙÛØÙÛÙ "
-"ØÙÙÛÙ IPv6 ØÛÙÙÛØ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØØ ØØØÙÙÙÙØÙÙ ØØÙØÙÙØØÙØ ØÙØØØÛØ ØÛØ."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr "ØØØ ÙØØÙÙÙÙÙÚ ØØØÙÙØÙÙÙ ÙÛØÙØÙÛ ØÙØÙÙØÙØÙØØÙ ØØØÙØÙÙÛØ. ØÙØØÙÙ ÙÛÙ ØØØÙØÙÙÛØÙÙ ÙÛØ ØÙÙÛÙ ØØÙØÙÚ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+msgid "D_HCP client ID:"
+msgstr "D_HCP ØØØÙÙØ ID:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:307
+#| msgid "_Search domains:"
+msgid "S_earch domains:"
+msgstr "ØØØÙØÙÙÛØÙÙ ØÙØØÛ(_E):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:298
 msgid "DNS ser_vers:"
 msgstr "DNS ÙÛÙØØÙÙÛØÙØÙÙØÙ(_D)Ø"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr "ØØØ ÙØØÙÙÙÙÙÚ ØØØÙÙØÙÙÙ ÙÛØÙØÙÛ ØÙØÙÙØÙØÙØØÙ ØØØÙØÛ ÙÛÙØØÙÙÛØÙØ(DNS)ÙÙÚ IP ØØØØÛØÙ. ØÙØØÙÙ ÙÛÙ ØØØÙØÛ ÙÛÙØØÙÙÛØÙØ ØØØØÛØÙÙÙ ÙÛØ ØÙÙÛÙ ØØÙØÙÚ."
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "ØÛØÛÙ(_M):"
+#| msgid "Require IPv4 addressing for this connection to complete"
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "IPv_4 ØØØØÛØ ØÙÙØØ ØØÙØÙÙ ØÛ ØÙÙ ØÛÙØØ ØØÙØÙÙÙÙÙØÛ."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Routesâ"
-msgstr "ÙÛØÛÙÙÛ(_R)â"
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr "ØÛÙØÛÙÙØØÙØÙ IPv6 ØÙØÙÙØÙØØ ØØØÙØÙØØÙ ÛØÙÙØØØØ ØÛÚÛØ IPv4 ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙÛÙ IPv6 ØÛÙÙÛØ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØØ ØØØÙÙÙÙØÙÙ ØØÙØÙÙØØÙØ ØÙØØØÛØ ØÛØ."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
-msgstr "ØØØÙØÙÙÛØÙÙ ØÙØØÛ(_S)"
+msgid "_Routesâ"
+msgstr "ÙÛØÛÙÙÛ(_R)â"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
-msgstr "ØÛ ØØØÙÙÙÙØÙÙ ØØÙØÙÙÙÙØÙ ØÛÚÛÙ IPv6 ØØØØÛØÙ ÙÛØÛÙ"
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#| msgid "Require IPv6 addressing for this connection to complete"
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr "IPv_4 ØØØØÛØ ØÙÙØØ ØØÙØÙÙ ØÛ ØÙÙ ØÛÙØØ ØØÙØÙÙÙÙÙØÛ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr ""
-"ØÛÙØÛÙÙØØÙØÙ IPv4 ØÙØÙÙØÙØØ ØØØÙØÙØØÙ ÛØÙÙØØØØ ØÛÚÛØ IPv6 ØÛÙÙÛØ ÙÛØÙÛÙ "
-"ØÙÙÛÙ IPv4  ØÛÙÙÛØ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØØ ØØØÙÙÙÙØÙÙ ØØÙØÙÙØØÙØ ØÙØØØÛØ ØÛØ."
+msgstr "ØÛÙØÛÙÙØØÙØÙ IPv4 ØÙØÙÙØÙØØ ØØØÙØÙØØÙ ÛØÙÙØØØØ ØÛÚÛØ IPv6 ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙÛÙ IPv4  ØÛÙÙÛØ ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØØ ØØØÙÙÙÙØÙÙ ØØÙØÙÙØØÙØ ØÙØØØÛØ ØÛØ."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Any"
+msgstr "ØØÙÙØØÙ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "3G (UMTS/HSPA)"
 msgstr "3G (UMTS/HSPA)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "Advanced"
-msgstr "ØØÙÙÙ"
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr "ØÛÚÛØ ØØØ ØÙØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØØ ÙÛØÙØÙÛ ØÙØØØÛØ ØÛØ"
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "ØØÙØÙÙ 3G (UMTS/HSPA)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "ØØÙÙØØÙ"
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "ØØÙØÙÙ 2G (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "ØØØØØ"
+#| msgid "Prefer 2G (GPRS/EDGE)"
+msgid "Prefer 4G (LTE)"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "ØÛØÚÛØØâ"
+msgid "Use only 4G (LTE)"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "N_etwork ID:"
-msgstr "ØÙØ ID (_E):"
+msgid "Basic"
+msgstr "ØØØØØ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "ÙÙÙÛØ(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PIN(_N):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "ØØÙØÙÙ 2G (GPRS/EDGE)"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "ØØÙØÙÙ 3G (UMTS/HSPA)"
+msgid "Advanced"
+msgstr "ØØÙÙÙ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "Sho_w passwords"
-msgstr "ØÙÙÙÙ ÙÛØØÛØ(_W)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "_APN:"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
+msgid "N_etwork ID:"
+msgstr "ØÙØ ID (_E):"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "ØÙÙÙ(_T):"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
+msgid "Change..."
+msgstr "ØÛØÚÛØØâ"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+msgid "P_IN:"
+msgstr "P_IN:"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#| msgid "Allow roaming if home network is not available"
+msgid "Allow _roaming if home network is not available"
+msgstr "ØÛÚÛØ ØØØÙÙÛ ØÙØÙ ØÙØÙÙÙÙØÛØ ÙÛØÙÛ ØÙØÙÙØÙÚ."
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
+msgid "Sho_w passwords"
+msgstr "ØÙÙÙÙ ÙÛØØÛØ(_W)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "BSD ØØÙÙÙÙ ÙØÛØÙØØÙØ ØÙØØØÛØ ØÛØ(_B)"
+msgid "Authentication"
+msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Deflate ØØÙÙÙÙ ÙØÛØÙØØÙØ ØÙØØØÛØ ØÛØ(_D)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "ØÙØØØÛØ ØÛØÙÙÚÛÙ ØÛØÛÙÙØØ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methodsâ"
+msgstr "ØÛÙÙÙÙÛ ØÛØÛÙÙ(_M)â"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "ÙØÛØÙØØ"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "ÙÛÙØÙØÙÙ ÙÛÙØÙØØ ØÙÙÙØÙØØ(MPPE)ÙÙ ØÙØÙÛØ(_U)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methodsâ"
-msgstr "ØÛÙÙÙÙÛ ØÛØÛÙÙ(_M)â"
+msgid "_Require 128-bit encryption"
+msgstr "128 ØÙØÙÙÙ ØÙÙÙØÙØØ ØÛØÛØ(_R)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "ØÛÙØ ØØØØ"
+msgid "Use _stateful MPPE"
+msgstr "ÚØÙÛØÙÙÙ MPPE ÙÙ ØÙØÙÛØ(_S)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "PPP ØÛÙØ ØØØØ ØÙÙØÙÙÙØÙÙÙ ØÛÛÛØ(_E)"
+msgid "Allow _BSD data compression"
+msgstr "BSD ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙØÛØÙÙØÙØØ ÙÙÙ ÙÙÙ(_B)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "TCP ØØØÙÙÙ ÙØÛØÙØØÙÙ ÙÙÙÙØÙ(_H)"
+msgid "Allow _Deflate data compression"
+msgstr "Deflate ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙØÛØÙÙØÙØØ ÙÙÙ ÙÙÙ(_D)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "ÚØÙÛØÙÙÙ MPPE ÙÙ ØÙØÙÛØ(_S)"
+msgid "Use TCP _header compression"
+msgstr "TCP ØØØÙÙÙ ÙØÛØÙØØÙÙ ÙÙÙÙØÙ(_H)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "128 ØÙØÙÙÙ ØÙÙÙØÙØØ ØÛØÛØ(_R)"
+msgid "Echo"
+msgstr "ØÛÙØ ØØØØ"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "ÙÛÙØÙØÙÙ ÙÛÙØÙØØ ØÙÙÙØÙØØ(MPPE)ÙÙ ØÙØÙÛØ(_U)"
+msgid "Send PPP _echo packets"
+msgstr "PPPPP echo ØÙØÚÙÙÙØÙÙÙ ÙÙÙÙØ(_E)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#| msgid "Interface:"
+msgid "_Parent interface:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "ÙÙØÛÙÙØ ØÛÙÛÙ ØØØØÙÛØÙ(AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "ØØÙØÙÙØØÙÙ ÙÙÙ ØÛÙÙØÙØ(_O)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "ØÙÙÛÙ ÙÙØ ØÙØÙÛØ(_X)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "ÛØØÙØÛ ÙÛØØÛÙÙÙ ØØØØÙÛØÙ(MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
 msgstr ""
-"ØÛ ÙÛØÚÛ ÙÙØÚÛØÚÛÙ MAC ØØØØÛØÙ ØØØÙÙÙÙØ ÙÙØØÙØÙÙØØÙØØ ØÙØ ØÛØÙÛÙÛ ÙØØØÙÙ "
-"ØÛØØÙ ØØØØÛØ ÙÙÙÙÙ ØÙØÙÙØÙÙÙØÛ. ØÛ ØÙÙØÙØØØ MAC ÙÙÚ ÙÙÙÙÙ ØÛÙÙÙÙØÛ. ÙÙØØÙ: "
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "ÙÙØ ÙÙÙØØØÙÙ ÙÙÙÙÙÛ (TP)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
 msgid "_Cloned MAC address:"
-msgstr "ÙÙÙÙÙØÙØØÙ MAC ØØØØÛØÙ(_C):"
+msgstr "ÙÛÙÙÙÙØÙØØÙ MAC ØØØØÛØÙ(_C):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Device MAC address:"
-msgstr "ØÛØÙÛÙÛ MAC ØØØØÛØÙ(_D):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "ØÛØÙØ(_P):"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "ØÛØØÛØ(_S):"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "ØØÙØ"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#| msgid "Security:"
+msgid "S_ecurity:"
+msgstr "ØÙØÛØÛØÙÙÙ(_E):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "ØÙÙÙÛÙ(_D):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "ÙØÙØÙ(_H):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
 msgid "Infrastructure"
 msgstr "ÙÛØÛÙÙØ"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "ØÛÙÙÙ(_O):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "Mb/s"
-msgstr "Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ØÛ ØØÙÙØØ ØÛ ØØØÙÙÙÙØÙÙ ØÛ ÙÛØÚÛ ÙÙØÚÛØÚÛÙ BSSID ØÛÙÙØÙÛÙ ØÙÙØÙØ ØÙÙØØÛØ "
-"ÙÛÙØÙØÙ(AP)ÚÛ ØÛÙÚÙÙÛÙØÛ. ÙÙØØÙ: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "ÙÙÙÙØØ ÙÛÚÙ(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "_BSSID:"
-msgstr "BSSID (_B):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Mb/s"
+msgstr "ÙÛÚØØØÙØ/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "ØÛØØÛØ(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "SSID (_S):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_BSSID:"
+msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "C_hannel:"
+msgstr "ÙØÙØÙ(_H):"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "ØÙØÛØÛØÙÙÙ(_S):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "Ban_d:"
+msgstr "ØÙÙÙÛÙ(_D):"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "M_ode:"
+msgstr "ØÛÙÙÙ(_O):"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "SS_ID:"
+msgstr "SS_ID:"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
 msgstr "ØÙØØØÛØ ØÛØÙÙÚÛÙ ØÛÙØÛØÛØ ØÛØÛÙÙÙØÙ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "C_HAP"
-msgstr "C_HAP"
+msgid "_EAP"
+msgstr "EAP(_E)"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "Extensible Authentication Protocol"
 msgstr "ÙÛÚÛÙØÙÙÙÙ ØÙÙÙØÙØØÙ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_PAP"
+msgstr "PAP (_P)"
+
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
-msgstr ""
-"ÙÛÙ ØÛÚÛØÙØØØ ØÛÙÙÙÙÙÚÛÚÙÙÙÚ PPP ÙÛÙØØÙÙÛØÙØÙÙØÙ ØØØÙÙÙ ØÛÙØÛØÛØ ØÛØÛÙÙÙØÙÙÙ "
-"ÙÙÙÙØÙØÛ. ØÛÚÛØ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØØØ ØÛØÙ ÙÙÙÙØØ ØÛØÛÙÙÙØÙÙÙ ØØÙØÙ ØÙÙØÚ."
+msgid "Password Authentication Protocol"
+msgstr "ØÙÙ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+msgid "C_HAP"
+msgstr "C_HAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "ÙÙÙØÙØÙÙØ ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "ÙÙÙØÙØÙÙØ ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ ØÙÙÙÙÙÚÙ ÙÛØØÙ"
+msgid "_MSCHAP"
+msgstr "MSCHAP (_M)"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "ØÙÙ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "ÙÙÙØÙØÙÙØ ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "EAP(_E)"
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "MSCHAP (_M)"
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "ÙÙÙØÙØÙÙØ ØÛÚ ØÛÙØÙ ÙÙÙÙØ ÙÙÙ ØÛÙÙØÙØ ØÛÙØÛØÛØ ÙÛÙÙØÙÙÙ ØÙÙÙÙÙÚÙ ÙÛØØÙ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "PAP (_P)"
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr "ÙÛÙ ØÛÚÛØÙØØØ ØÛÙÙÙÙÙÚÛÚÙÙÙÚ PPP ÙÛÙØØÙÙÛØÙØÙÙØÙ ØØØÙÙÙ ØÛÙØÛØÛØ ØÛØÛÙÙÙØÙÙÙ ÙÙÙÙØÙØÛ. ØÛÚÛØ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØØØ ØÛØÙ ÙÙÙÙØØ ØÛØÛÙÙÙØÙÙÙ ØØÙØÙ ØÙÙØÚ."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
+msgid "Address"
+msgstr "ØØØØÛØ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
+msgid "Netmask"
+msgstr "ØÙØ ÙØØÙÙØÙ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
+msgid "Gateway"
+msgstr "ØÙØ ØÛØÙÙÙÙ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
+msgid "Metric"
+msgstr "ÙÛØØÙÙ"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
+msgid "Prefix"
+msgstr "ØØÙØÙ ÙÙØÛÙØÛÚÙ"
+
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
+#| msgid "Auto Ethernet"
+msgid "Ethernet"
+msgstr "ØÛÙÙØ ØÙØÙ"
+
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+msgid "Bond"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+msgid "Bridge"
+msgstr "ÙÛÛØÛÙ"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:252
+#| msgid "Hardware Address:"
+msgid "Hardware"
+msgstr "ÙØØØÙÙ ØÛØØÙ"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "ÙÛÛÚÛÙ"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
+#| msgid "Export VPN connection..."
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:371
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "ØØØÙÙÙÙØ ØÛÚØÙØÙÙÚÛÚ ØÛØÙÛØÙÛØÙ ÙØÙÛÙÛÙ ØØØØÙÙÙ ØÛÛÛØÙØÙÙ ØÛØÙÛÙÙÛØØÛØÛÙÙÙØÙ."
+
+#: ../src/connection-editor/new-connection.c:380
+msgid "Could not create new connection"
+msgstr "ÙÛÚÙ ØØØÙÙÙÙØ ÙÛØØÙÙÙØÙ"
+
+#: ../src/connection-editor/new-connection.c:515
+msgid "Connection delete failed"
+msgstr "ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/connection-editor/new-connection.c:562
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "%s ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØÙÙ ØØØØÙØ ØÛÚÛØÛÙØÙØØ"
+
+#: ../src/connection-editor/nm-connection-editor.c:118
+#, c-format
+msgid "Editing %s"
+msgstr "â%sâ ÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
+
+#: ../src/connection-editor/nm-connection-editor.c:122
+msgid "Editing un-named connection"
+msgstr "ØØØ ÙÙÙÛÙÙÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
+
+#: ../src/connection-editor/nm-connection-editor.c:282
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr "ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÚÛÚ ØÛØÙ ØÛÚØÙÙØØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØØÙØÙÙÙØÙ(ui. ÚÛØØÙØÙ ØÛÙÙÙÙÙØÙ)."
+
+#: ../src/connection-editor/nm-connection-editor.c:408
+msgid "_Save"
+msgstr "ØØÙÙØ(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "Save any changes made to this connection."
+msgstr "ØÛ ØØØÙÙÙÙØÙØ ÙÙÙØØÙ ÚÛØÙØÙØØÙ ØÛØÚÙØÙØÙÛØÙÙ ØØÙÙØ."
+
+#: ../src/connection-editor/nm-connection-editor.c:410
+msgid "_Save..."
+msgstr "ØØÙÙØ...(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:411
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ØÛ ÙØØÙÙÙØÙÙÙ ØØØÙÙÙ ØÙØÙÛØÙÛÚÙÙÛØÙÙÚ ØÛ ØØØÙÙÙÙØÙÙ ØØÙÙÙØÙ ØÛÚÛÙ ØÛÙØÛØ."
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+#| msgid "Could not create new connection"
+msgid "Could not create connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not edit connection"
+msgstr "ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÙÛÙÙÙØÙ"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+#| msgid "Error creating connection editor dialog."
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:536
+msgid "Error saving connection"
+msgstr "ØØØÙÙÙÙØÙØØÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../src/connection-editor/nm-connection-editor.c:537
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "ØØØÙÙÙ â%sâ/â%sâ ØÙÙØÛÛØØÙØ:%d"
+
+#: ../src/connection-editor/nm-connection-editor.c:631
+msgid "Error initializing editor"
+msgstr "ØÛÚØÙØÙÙÚÛÚÙÙ ØÛØÙÛÙÙÛØØÛØÚÛÙØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../src/connection-editor/nm-connection-editor.c:952
+msgid "Connection add failed"
+msgstr "ØØØÙÙÙÙØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
+msgid "Connection _name:"
+msgstr "ØØØÙÙÙÙØ ØØØÙ(_N):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#| msgid "E_xport"
+msgid "_Export..."
+msgstr "ØÛÙØÙÙØØ ÙÙÙ(_E)â"
+
+#: ../src/connection-editor/nm-connection-list.c:143
+msgid "never"
+msgstr "ÚÛØÚÙØ"
+
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
+msgid "now"
+msgstr "ÚØØÙØ"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d ÙÙÙÛØ ØÙÙÚÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:176
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d ØØØÛØ ØÙÙÚÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:188
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ÙÛÙ ØÙÙÚÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:194
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d ØØÙ ØÙÙÚÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d ØØÙ ØÛØÛÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:631
+msgid "Name"
+msgstr "ØØØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:644
+msgid "Last Used"
+msgstr "ØØØÙØÙÙ ÙÛØÙÙ ØÙØÙÛØÙÛÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:686
+msgid "Edit the selected connection"
+msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÙØÛ"
+
+#: ../src/connection-editor/nm-connection-list.c:687
+msgid "_Edit..."
+msgstr "ØÛÚØÙØ(_E) ..."
+
+#: ../src/connection-editor/nm-connection-list.c:688
+msgid "Authenticate to edit the selected connection"
+msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛØ ØÛÚÛÙ ØÛÙØÛØ"
+
+#: ../src/connection-editor/nm-connection-list.c:703
+msgid "Delete the selected connection"
+msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚÛØ"
+
+#: ../src/connection-editor/nm-connection-list.c:704
+msgid "_Delete..."
+msgstr "ØÛÚÛØ(_D)..."
+
+#: ../src/connection-editor/nm-connection-list.c:705
+msgid "Authenticate to delete the selected connection"
+msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØ ØÛÚÛÙ ØÛÙØÛØ"
+
+#: ../src/connection-editor/nm-connection-list.c:942
+msgid "Error creating connection"
+msgstr "ØØØÙÙÙÙØ ÙÛØÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:943
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "Â%s ØÛÚÛÙ ØØØÙÙÙÙØÙÙ ÙØÙØØÙ ÙÛØÛØÙÙ ØÙÙÙÙØÙ"
+
+#: ../src/connection-editor/nm-connection-list.c:998
+msgid "Error editing connection"
+msgstr "ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "ØÙØ VPN ØØØÙÙÙÙØ ØÙÙÙ ØØÙÙØ"
+#: ../src/connection-editor/nm-connection-list.c:999
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "UUID â%sâ ÙÙÚ ØØØÙØÙÙÙØÙÙÙ ØØÙØÙÙÙØÙ"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Createâ"
-msgstr "ÙÛØâ"
+#: ../src/connection-editor/page-8021x-security.c:121
+msgid "802.1x Security"
+msgstr "802.1x ØÙØÛØÛØÙÙÙÙ"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid ""
-"Select the type of VPN you wish to use for the new connection.  If the type "
-"of VPN connection you wish to create does not appear in the list, you may "
-"not have the correct VPN plugin installed."
+#: ../src/connection-editor/page-8021x-security.c:123
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load 802.1x Security user interface."
 msgstr ""
-"ØÙØ ØÙØÙÙØÙØÙÙ ØÙØØÛÙØÙØØÙ ÙÛÚÙ ØØØÙÙÙÙØ ØÛÚÛÙ VPN ØÙÙÙÙÙ ØØÙÙØÚ. ØÛÚÛØ ØÙØ "
-"ÙÛØÛØÙÙ ØÙØØÛÙØÙØØÙ VPN ØØØÙÙÙÙØ ØÙÙÙ ØÙØÙÙÙÙÙØÛ ØÙÙÙÙØØØ ØÙØ ØÛÙÙÙÙ ØÙØØØ "
-"VPN ÙÙØØÛØÙÙØÙÙÙ ØÙØÛÙÙØØØÛØÙÙØØÙ ØÛÙÙØÙÚÙØ ÙÛÙÙÙÙ."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
-msgid "Address"
-msgstr "ØØØØÛØ"
+#: ../src/connection-editor/page-8021x-security.c:141
+#| msgid "Use 802.1X security for this connection"
+msgid "Use 802.1_X security for this connection"
+msgstr "802.1_X ÙÙØØØØÙÙ ØÙØÙÙØÙØ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
-msgid "Netmask"
-msgstr "ØÙØ ÙØØÙÙØÙ"
+#: ../src/connection-editor/page-bond.c:422
+#| msgid "Could not load wired user interface."
+msgid "Could not load bond user interface."
+msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
-msgid "Gateway"
-msgstr "ØÙØ ØÛØÙÙÙÙ"
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Bond connection %d"
+msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-msgid "Metric"
-msgstr "ÙÛØØÙÙ"
+#: ../src/connection-editor/page-bridge.c:214
+#| msgid "Could not load wired user interface."
+msgid "Could not load bridge user interface."
+msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
-msgid "Prefix"
-msgstr "ØØÙØÙ ÙÙØÛÙØÛÚÙ"
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Bridge connection %d"
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-bridge-port.c:117
+#| msgid "Could not load wired user interface."
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:143
 msgid "Could not load DSL user interface."
 msgstr "DSL ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙ ÙÛÙÙÛÙÙÙØÙ."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:235
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ØØØÙÙÙÙØÙ %d"
 
+#: ../src/connection-editor/page-ethernet.c:90
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:113
+#: ../src/connection-editor/page-wimax.c:70
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr "ØÛ ØØÙÙØØ ØÛ ØØØÙÙÙÙØÙÙ ØÛ ÙÛØÚÛ ÙÙØÚÛØÚÛÙ MAC ØØØØÛØÙ ØÛÙÙØÙÛÙ ØÙØ ØÛØÙÛÙÙØÙÚÛ ØÛÙÚÙÙÛÙØÛ. ÙÙØØÙ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:253
+#| msgid "Could not load wired user interface."
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:396
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Ethernet connection %d"
+msgstr ""
+
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:57
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "ÙÛÚÛÙØÙÙÙ"
+
+#: ../src/connection-editor/page-general.c:58
+msgid ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:59
+#| msgid "NetworkManager is not running..."
+msgid "FirewallD is not running."
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:330
+#| msgid "Could not load wired user interface."
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:171
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:263
+#, c-format
+#| msgid "Wired connection %d"
+msgid "InfiniBand connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
@@ -1583,18 +2241,30 @@ msgstr "ÙÛÙÛØ Link-Local"
 
 #: ../src/connection-editor/page-ip4.c:197
 msgid "Disabled"
-msgstr "ÚÛÙÙÛÙÚÛÙ"
+msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØØÙ"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:296
+#| msgid "DNS ser_vers:"
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:305
+#| msgid "_Search domains:"
+msgid "Additional s_earch domains:"
+msgstr "ØØØÙØ ØÙØØÛÙØÙØØÙ ØØØÙØÙÙÛØ(_E):"
+
+#: ../src/connection-editor/page-ip4.c:860
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ÙÙÚ IPv4 routes ÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:1011
 msgid "IPv4 Settings"
 msgstr "IPv4 ØÛÚØÛÙÙÙØÙ"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:1013
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
 
@@ -1603,7 +2273,7 @@ msgid "Automatic, addresses only"
 msgstr "ÙÛÙÛØ ØØÙØÙÙØØÙÙ ØØØØÛØÙØØ"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "ÙÛØÛØ ÙÙÙÙØ"
 
@@ -1611,49 +2281,61 @@ msgstr "ÙÛØÛØ ÙÙÙÙØ"
 msgid "Automatic, DHCP only"
 msgstr "ØØÙØÙÙØØÙÙØ ÙÛÙÛØ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:826
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ÙÙÚ IPv6 routes ÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
 
-#: ../src/connection-editor/page-ip6.c:946
+#: ../src/connection-editor/page-ip6.c:975
 msgid "IPv6 Settings"
 msgstr "IPv6 ØÛÚØÛÙÙÙØÙ"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:977
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
 msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:408
 msgid "Unsupported mobile broadband connection type."
 msgstr "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÙØØÙ ÙÛÚÙÛ ØØØÙÙÙÙØ ØÙÙÙ."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:658
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙ ØÙÙÙÙÙ ØØÙÙØ"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:693
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
-msgstr ""
-"ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ÙÙÙÙØÙØØÙ ØÛØÙÙÙÙÙÙ ØØÙÙØÚ. ØÛØÙ "
-"ÙÙÙØÙÙÙØÙÚÙØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØØÙÙ ØÙØØÚ."
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØ ÙÙÙÙØÙØØÙ ØÛØÙÙÙÙÙÙ ØØÙÙØÚ. ØÛØÙ ÙÙÙØÙÙÙØÙÚÙØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØØÙÙ ØÙØØÚ."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:698
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr ""
-"ØÛÙÙÙÙÙÚÛÚÙÙ G_SM-ØØØØØÙÙ ØÛØÙÙÙÙØÙÙÙ ØÙØÙÙØÙØÛ(i.e.GPRSØ EDGEØ UMTSØ HSPA)"
+msgstr "ØÛÙÙÙÙÙÚÛÚÙÙ G_SM-ØØØØØÙÙ ØÛØÙÙÙÙØÙÙÙ ØÙØÙÙØÙØÛ(i.e.GPRSØ EDGEØ UMTSØ HSPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:705
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÙ C_DMA -ØØØØØÙØÙÙÙ ØÛØÙÙÙÙÙÙ ØÙØÙÙØÙØÛ(1xRTTØ EVDO)"
 
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:268
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:266
+msgid "GSM"
+msgstr "GSM"
+
 #: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
@@ -1669,6 +2351,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-fast.c:277
 #: ../src/wireless-security/eap-method-peap.c:246
 #: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
@@ -1689,741 +2372,575 @@ msgstr "ÙÙÙ"
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ÙÙÚ PPP ØÛÙØÛØÛØ ØÛØÛÙÙÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:284
 msgid "PPP Settings"
 msgstr "PPP ØÛÚØÛÙÙÙØÙ"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:286
 msgid "Could not load PPP user interface."
 msgstr "PPP ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../src/connection-editor/page-vlan.c:482
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+#| msgid "VPN connection %d"
+msgid "VLAN connection %d"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:115
 msgid "Could not load VPN user interface."
 msgstr "VPN ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:130
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
-msgstr "'%s' ØÛÚÛÙ VPN ÙÙØØÛØÙØ ÙÛÙØØÙÙÛØ ØØÙØÙÙØÙØÛ."
+msgstr "â%sâ ØÛÚÛÙ VPN ÙÙØØÛØÙØ ÙÛÙØØÙÙÛØ ØØÙØÙÙØÙØÛ."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ØØØÙÙÙÙØÙ %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
+#: ../src/connection-editor/page-vpn.c:250
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ØÛ ØØÙÙØØ ØÛ ØØØÙÙÙÙØÙÙ ØÛ ÙÛØÚÛ ÙÙØÚÛØÚÛÙ MAC ØØØØÛØÙ ØÛÙÙØÙÛÙ ØÙØ "
-"ØÛØÙÛÙÙØÙÚÛ ØÛÙÚÙÙÛÙØÛ. ÙÙØØÙ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
-msgstr "ØÙÙÙÙÙ"
-
-#: ../src/connection-editor/page-wired.c:269
-msgid "Could not load wired user interface."
-msgstr "ØÙÙÙÙÙ ØÙØ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
-
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-msgid "Wired connection %d"
-msgstr "ØÙÙÙÙÙ ØØØÙÙÙÙØÙ %d"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr "VPN ÙÙØØÛØÙÙØÙ VPN ØØØÙÙÙÙØÙÙÙ ØÙØØØ ØÙÙÙÙØØ ÙÙÙØÙÙÙØÙ.\n"
+"\n"
+"ØØØØÙÙÙ: VPN ÙÛÙØØÙÙÛØ ØÙÙÙ ÙÙÙ."
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "802.1x ØÙØÛØÛØÙÙÙÙ"
+#: ../src/connection-editor/page-vpn.c:275
+msgid "Choose a VPN Connection Type"
+msgstr "ØÙØ VPN ØØØÙÙÙÙØ ØÙÙÙ ØØÙÙØ"
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "ØÙÙÙÙÙ ØÙØÛØÛØÙÙÙÙ ØÙØÛØÛØÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ."
+#: ../src/connection-editor/page-vpn.c:276
+msgid ""
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr "ØÙØ ØÙØÙÙØÙØÙÙ ØÙØØÛÙØÙØØÙ ÙÛÚÙ ØØØÙÙÙÙØ ØÛÚÛÙ VPN ØÙÙÙÙÙ ØØÙÙØÚ. ØÛÚÛØ ØÙØ ÙÛØÛØÙÙ ØÙØØÛÙØÙØØÙ VPN ØØØÙÙÙÙØ ØÙÙÙ ØÙØÙÙÙÙÙØÛ ØÙÙÙÙØØØ ØÙØ ØÛÙÙÙÙ ØÙØØØ VPN ÙÙØØÛØÙÙØÙÙÙ ØÙØÛÙÙØØØÛØÙÙØØÙ ØÛÙÙØÙÚÙØ ÙÛÙÙÙÙ."
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
-msgstr "ØÛ ØØØÙÙÙÙØ ØÛÚÛÙ 802.1X ØÙØÛØÛØÙÙÙÙÙÙ ØÙØÙÛØ"
+#: ../src/connection-editor/page-wifi.c:98
+#| msgid ""
+#| "This option locks this connection to the wireless access point (AP) "
+#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
 #, c-format
 msgid "default"
 msgstr "ÙÛÚÛÙØÙÙÙ"
 
-#: ../src/connection-editor/page-wireless.c:195
+#: ../src/connection-editor/page-wifi.c:219
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "ØÙÙØÙØ"
-
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
-msgstr "WiFi ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ."
-
-#: ../src/connection-editor/page-wireless.c:658
-#, c-format
-msgid "Wireless connection %d"
-msgstr "ØÙÙØÙØ ØØØÙÙÙÙØÙ %d"
-
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128 ØÙØÙÙÙ ØØÚÙÛÚ(16ÙÙÙ ÙØÙÙ ASCII)"
-
-#: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128 ØÙØÙÙÙ ØÙÙÙØ"
-
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
-msgid "Dynamic WEP (802.1x)"
-msgstr "ØÙÙØÙÙÙ WEP (802.1x)"
-
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
-msgid "WPA & WPA2 Personal"
-msgstr "WPA ÛÛ WPA2 ÙÙØÙÙÙÙ ÙÛØØÙØÙ"
-
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA ÛÛ WPA2 ÙØØØØÙØ ÙÛØØÙØÙ"
-
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "WiFi ØÙØÛØÛØÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛØ WiFi ØÛÚØÙÙÙ ÙÛÙ"
-
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
-msgstr "ØÙÙØÙØ ØÙØ ØÙØÛØÛØÙÙÙÙ"
-
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi ØÙØÛØÛØÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÛÙØÛ."
-
-#: ../src/connection-editor/nm-connection-editor.c:101
-#, c-format
-msgid "Editing %s"
-msgstr "'%s' ÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "ØØØ ÙÙÙÛÙÙÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÛØØÙØÛ"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
-msgstr ""
-"ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÚÛÚ ØÛØÙ ØÛÚØÙÙØØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØØÙØÙÙÙØÙ(ui. ÚÛØØÙØÙ "
-"ØÛÙÙÙÙÙØÙ)."
-
-#: ../src/connection-editor/nm-connection-editor.c:391
-msgid "Error creating connection editor dialog."
-msgstr "ØØØÙÙÙÙØ ØÛÚØÙØÙÙÚÛÚ ØÛØÙÛØÙÛØÙ ÙÛØÛÙÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ."
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "ØØÙÙØ(_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "ØÛ ØØØÙÙÙÙØÙØ ÙÙÙØØÙ ÚÛØÙØÙØØÙ ØÛØÚÙØÙØÙÛØÙÙ ØØÙÙØ."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "ØØÙÙØ...(_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"ØÛ ÙØØÙÙÙØÙÙÙ ØØØÙÙÙ ØÙØÙÛØÙÛÚÙÙÛØÙÙÚ ØÛ ØØØÙÙÙÙØÙÙ ØØÙÙÙØÙ ØÛÚÛÙ ØÛÙØÛØ."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "ØØØÙÙÙ ØÙØÙÛØÙÛÚÙÙÛØ ØÙØÙÙØÛÙÛÙØÛ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "ØØÙØÙÙØØÙÙ ØØØÙØÙ(_A)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "ØØØÙÙÙÙØ ØØØÙ(_N):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "ØÛÙØÙÙØØ ÙÙÙ(_X)..."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "ØÙÙÙÙØØ ÙÙÙ(_I)"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ÚÛØÚÙØ"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "ÚØØÙØ"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d ÙÙÙÛØ ØÙÙÚÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ØØØÛØ ØÙÙÚÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ÙÛÙ ØÙÙÚÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ØØÙ ØÛØÛÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d ØØÙ ØÛØÛÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "ØØØÙÙÙÙØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "ØØØÙÙÙÙØÙØØÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ØØØÙÙÙ '%s'/'%s' ØÙÙØÛÛØØÙØ:%d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ ÙÛØÛÙØÙ."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "Error initializing editor"
-msgstr "ØÛÚØÙØÙÙÚÛÚÙÙ ØÛØÙÛÙÙÛØØÛØÚÛÙØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+#: ../src/connection-editor/page-wifi.c:473
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load Wi-Fi user interface."
 msgstr ""
-"ØØØÙÙÙÙØ ØÛÚØÙØÙÙÚÛÚ ØÛØÙÛØÙÛØÙ ÙØÙÛÙÛÙ ØØØØÙÙÙ ØÛÛÛØÙØÙÙ ØÛØÙÛÙÙÛØØÛØÛÙÙÙØÙ."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "ÙÛÚÙ ØØØÙÙÙÙØ ÙÛØØÙÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "ÙÛÚÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÙÛÙÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:717
-msgid "Could not edit connection"
-msgstr "ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÙÛÙÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:747
-msgid "Connection delete failed"
-msgstr "ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/page-wifi.c:650
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "%s ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØÙÙ ØØØØÙØ ØÛÚÛØÛÙØÙØØ"
-
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
-msgid "Cannot import VPN connection"
-msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÙÙÙÙØØ ÙÙÙØÙÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:916
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"VPN ÙÙØØÛØÙÙØÙ VPN ØØØÙÙÙÙØÙÙÙ ØÙØØØ ØÙÙÙÙØØ ÙÙÙØÙÙÙØÙ.\n"
-"\n"
-"ØØØØÙÙÙ: VPN ÙÛÙØØÙÙÛØ ØÙÙÙ ÙÙÙ."
-
-#: ../src/connection-editor/nm-connection-list.c:929
-msgid "Could not edit imported connection"
-msgstr "ØÙÙÙÙØØ ÙÙÙÙÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÙÛÙÙÙØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "ØØØÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
-msgstr "ØØØÙØÙÙ ÙÛØÙÙ ØÙØÙÛØÙÛÙ"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
+#| msgid "Wired connection %d"
+msgid "Wi-Fi connection %d"
 msgstr ""
-"ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØØÙ VPN ÙÙØØÛØÙÙØÙ ÙÙÙ. ØÛ ØÙÙÚÙÙÙ ÙÙØØÙØÙØ ØÛÚÛÙ ØÙØÙÙ "
-"ØÙØÙÙØÙÚ."
-
-#: ../src/connection-editor/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "ØÛÚØÙØ(_E)"
-
-#: ../src/connection-editor/nm-connection-list.c:1239
-msgid "Edit the selected connection"
-msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÙØÛ"
 
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "ØÛÚØÙØ(_E) ..."
+#: ../src/connection-editor/page-wifi-security.c:265
+#| msgctxt "Wifi/wired security"
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "ÙÙÙ"
 
-#: ../src/connection-editor/nm-connection-list.c:1241
-msgid "Authenticate to edit the selected connection"
-msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛØ ØÛÚÛÙ ØÛÙØÛØ"
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128 ØÙØÙÙÙ ØØÚÙÛÚ(16ÙÙÙ ÙØÙÙ ASCII)"
 
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
-msgstr "ØÛÚÛØ(_D)"
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 ØÙØÙÙÙ ØÙÙÙØ"
 
-#: ../src/connection-editor/nm-connection-list.c:1257
-msgid "Delete the selected connection"
-msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚÛØ"
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+msgid "Dynamic WEP (802.1x)"
+msgstr "ØÙÙØÙÙÙ WEP (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr "ØÛÚÛØ(_D)..."
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+msgid "WPA & WPA2 Personal"
+msgstr "WPA ÛÛ WPA2 ÙÙØÙÙÙÙ ÙÛØØÙØÙ"
 
-#: ../src/connection-editor/nm-connection-list.c:1259
-msgid "Authenticate to delete the selected connection"
-msgstr "ØØÙÙØÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚÛØÛØ ØÛÚÛÙ ØÛÙØÛØ"
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA ÛÛ WPA2 ÙØØØØÙØ ÙÛØØÙØÙ"
 
-#: ../src/connection-editor/nm-connection-list.c:1538
-msgid "Error creating connection"
-msgstr "ØØØÙÙÙÙØ ÙÛØÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+#: ../src/connection-editor/page-wifi-security.c:396
+#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Â%s ØÛÚÛÙ ØØØÙÙÙÙØÙÙ ÙØÙØØÙ ÙÛØÛØÙÙ ØÙÙÙÙØÙ"
+#: ../src/connection-editor/page-wifi-security.c:407
+#| msgid "Wireless Security"
+msgid "Wi-Fi Security"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
-msgid "Error editing connection"
-msgstr "ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+#: ../src/connection-editor/page-wifi-security.c:409
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1595
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Â%s ØÛÚÛÙ ØØØÙÙÙÙØÙÙ ÙØÙØØÙ ØÛÚØÙØÙÛØÙÙ ØÙÙÙÙØÙ"
+#: ../src/connection-editor/page-wimax.c:137
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load WiMAX user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1607
+#: ../src/connection-editor/page-wimax.c:233
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "UUID '%s' ÙÙÚ ØØØÙØÙÙÙØÙÙÙ ØØÙØÙÙÙØÙ"
+#| msgid "Wired connection %d"
+msgid "WiMAX connection %d"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:207
+msgid "Cannot import VPN connection"
+msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÙÙÙÙØØ ÙÙÙØÙÙÙØÙ"
 
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:209
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
-msgstr ""
-"'%s' ÚÛØØÙØÙÙÙ ØÙÙÛÙØÙÙÙØÙ ÙØÙÙ ØÙÙÛÙØØÙ VPN ØØØÙÙÙÙØ ØÛÚÛØÙÙÙ ØÛØ ØÙÚÙÚÛ "
-"ØØÙÙÙØØÙ\n"
+msgstr "â%sâ ÚÛØØÙØÙÙÙ ØÙÙÛÙØÙÙÙØÙ ÙØÙÙ ØÙÙÛÙØØÙ VPN ØØØÙÙÙÙØ ØÛÚÛØÙÙÙ ØÛØ ØÙÚÙÚÛ ØØÙÙÙØØÙ\n"
 "\n"
 "ØØØØÙÙÙ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:261
+#: ../src/connection-editor/vpn-helpers.c:241
 msgid "Select file to import"
 msgstr "ØÙÙÙÙØØ ÙÙÙÙØÙØØÙ ÚÛØØÛØÙÙ ØØÙÙØ"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:292
 #, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "\"%s\" ØØØÙÙÙ ØÙØ ÚÛØØÛØ ØÛØÛÙØÙÙ ÙÛÛØÛØ."
+msgstr "Â%s ØØØÙÙÙ ØÙØ ÚÛØØÛØ ØÛØÛÙØÙÙ ÙÛÛØÛØ."
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:294
 msgid "_Replace"
 msgstr "ØØÙÙØØØÛØ(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:296
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "ØÙØ ØØÙÙÙØØÙ %s ÙÙ VPN ØØØÙÙÙÙØÙØØ ØØÙÙØØØÛØØÙØÙØØ"
 
-#: ../src/connection-editor/vpn-helpers.c:349
+#: ../src/connection-editor/vpn-helpers.c:332
 msgid "Cannot export VPN connection"
 msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÛÙØÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:334
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr ""
-"VPN ØØØÙÙÙÙØÙ '%s' ÙÙ %s ÚÛ ØÛÙØÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ.\n"
+msgstr "VPN ØØØÙÙÙÙØÙ â%sâ ÙÙ %s ÚÛ ØÛÙØÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ.\n"
 "\n"
 "ØØØØÙÙÙ: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:369
 msgid "Export VPN connection..."
 msgstr "VPN ØØØÙÙÙÙØÙÙÙ ØÛÙØÙÙØØ ÙÙÙ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN ØØØÙÙÙÙØÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr "ØÙØ ØØØÙÛØØÛÚ ÙÙÙÙØÙÚØÙ ØÛØÙ ØÛÚØÙÙØØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØØÙØÙÙÙØÙ(ui. ÚÛØØÙØÙ ØÛÙÙÙÙÙØÙ)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "ØÛÙÛÙÙÙÙÚÙØ ØÙØÙÙØÙØÙÛ ÚØØÙØÙØÙØÙ!"
+#: ../src/gnome-bluetooth/bt-widget.c:321
+#, c-format
+#| msgid ""
+#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgid ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr "ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(D-Bus ÙÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ:(%s) %s)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s ØÙØÙ"
+#| msgid ""
+#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr "ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(NetworkManagerÙÙ ØÙØØÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ:(%s) %s)"
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "ÙØÙÙÙÙÙÚÙØÙÙ ØÙØ ØÙØ ØÛØÙÛÙÙØÙ ÙÙÙÙÙ ØÙØÙÙØÙÚ(PAN/NAP)"
+
+#: ../src/gnome-bluetooth/bt-widget.c:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "ÙØÙÙÙÙÙÚÙØÙÙ ØÙØÙÙØÙÙ ØÙÙØÛØÙÛØÙÙ ØÙÙØØÛØ ÙÙÙÙÚ(DUN)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
 #, c-format
 msgid "Error: %s"
 msgstr "ØØØØÙÙÙ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "DUN ØØØÙÙÙÙØÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
+msgid "Your phone is now ready to use!"
+msgstr "ØÛÙÛÙÙÙÙÚÙØ ØÙØÙÙØÙØÙÛ ÚØØÙØÙØÙØÙ!"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
 msgid "Mobile wizard was canceled"
 msgstr "ÙÛÚÙÛ ÙÛØÛÙÙÙÚÛÚÙ ØÙÙØØ ÙÙÙÙÙØÙ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "ÙØÙÛÙÛÙ ØÛÙÛÙÙÙ ØÛØÙÛÙÙØÙ ØÙÙÙ( GSM ÙØÙÙ CDMA ØÛÙÛØ)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
+msgid "unknown modem type."
+msgstr "ÙÙØÛÙÙÙÚ ØÙÙÙ ÙØÙÛÙÛÙ."
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
 msgid "failed to connect to the phone."
 msgstr "ØÛÙÛÙÙÙØØ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
 msgid "unexpectedly disconnected from the phone."
 msgstr "ØÛÙÛÙÙÙ ØØØÙÙÙÙÙ ØØØÙÙÙÙØ ØØØØØÙÙÙÙ ØÛØÛÙØÙ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
 msgid "timed out detecting phone details."
 msgstr "ØÛÙÛÙÙÙ ØÛÙØÙÙØØÙÙÙ ØÛÙØÛØÛÛØØÙØÙØØ ÛØÙÙØ ÚÛÙÙÙÙÙØÙÙ ØØØØÙ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
 msgid "Detecting phone configuration..."
 msgstr "ØÛÙÛÙÙÙ ØÛÙÙÙÙÙØÙÙÙ ØÛÙØÛØÛÛØØÙØÛ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "ÙÛÙÚÙØ ØÛØÙÛÙÙØÙ ØÛÙÙÙÙÙØÙ."
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#| msgid "Error editing connection"
+msgid "error getting bus connection"
+msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
-msgstr ""
-"ØÛÙÛÙÙÙ ØÙØÙØØ ØØØÙÙÙÙØÙÙ ØÛÚØÛØØÙÙ ØÙÙÚÙØÙ ÙÛÚÛÙØÙÙÙ ÙÛÙÚÙØ ÙØØÙØØØÛØØÛÚÙÙ "
-"ÙÙØØÙØÙØÙÚÙØ ØÛØÛØ."
+msgstr "ØÛÙÛÙÙÙ ØÙØÙØØ ØØØÙÙÙÙØÙÙ ØÛÚØÛØØÙÙ ØÙÙÚÙØÙ ÙÛÚÛÙØÙÙÙ ÙÛÙÚÙØ ÙØØÙØØØÛØØÛÚÙÙ ÙÙØØÙØÙØÙÚÙØ ØÛØÛØ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1007
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr ""
-"ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(D-Bus ÙÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ:%s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1017
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(D-Bus ÛØÙØÙÛØÚÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ)"
+msgid "Failed to create PAN connection: %s"
+msgstr "PAN ØØØÙÙÙÙØÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr ""
-"ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(NetworkManagerÙÙ ØÙØØÛÛØØÙØÙØØ "
-"ØØØØÙÙÙ ÙÛØÛÙØÙ:%s)"
+msgid "%s Network"
+msgstr "%s ØÙØÙ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ÙØÙÙÙÙÙÚÙØÙÙ ØÙØ ØÙØ ØÛØÙÛÙÙØÙ ÙÙÙÙÙ ØÙØÙÙØÙÚ(PAN/NAP)"
+#: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "ØÛ ØÛØÙÛÙÙÙÙ ØØÙØÙÙØØÙÙ ÙÛÙÛÙØÙØÙØ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ÙØÙÙÙÙÙÚÙØÙÙ ØÙØÙÙØÙÙ ØÙÙØÛØÙÛØÙÙ ØÙÙØØÛØ ÙÙÙÙÚ(DUN)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "ÙÛÙÛÙØÙØÙØ(_U)"
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "ØØØÙÙÙÙØ ØÛÚÛØÙÙØÙ"
+
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "ØØÙØÙÙ ØÙØ ØØØÙÙÙÙØÙÙØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙÚÙØ ØØØØÙØÙÙÙ ØÛÚØÛÙÙÛØ ØÙÙÛÙ ØÛÙÙÛÙÚÛÙ:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
 msgid "Your Device:"
 msgstr "ØÛØÙÛÙÙÚÙØ:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
 msgid "Your Provider:"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÚÙØ:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
 msgid "Your Plan:"
 msgstr "ÙÙÙØÙÙÚÙØ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
 "resources, double-check your settings.  To modify your mobile broadband "
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
-msgstr ""
-"ØØÙÙÙØØÙ ØÛÚØÛÙÙÛØ ØÙÙÙÚÛ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØÚÛ ØØØÙØÙØØÙ ØÙØ "
-"ØØØÙÙÙÙØÙÙ ÙÛØÙØÛ. ØÛÚÛØ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØØ ÙØÙÙ ØÙØ ØØÙÙÙÙÙÙØÙÙÙ ØÙÙØØÛØ "
-"ÙÙÙØÙÙÙØÙÚÙØØ ØÛÚØÛÙÙÙØÙÚÙØÙÙ ÙÙØ ÚÛÙÙÚ. ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙÚÙØÙÙÚ "
-"ØÛÚØÛÙÙÙØÙÙÙ ØÛØÚÛØØÙØ ØÛÚÛÙ \"ØÙØØÛÙØââ\" ØØÙÙØØ ØÙÙØÙØØØ ØÙØÙÙÙÙÙÙØÙÙ "
-"\"ØÙØ ØØØÙÙÙÙØÙÙØÙ\" ÙÙ ØØÙÙØÚ."
+msgstr "ØØÙÙÙØØÙ ØÛÚØÛÙÙÛØ ØÙÙÙÚÛ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØÚÛ ØØØÙØÙØØÙ ØÙØ ØØØÙÙÙÙØÙÙ ÙÛØÙØÛ. ØÛÚÛØ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØØ ÙØÙÙ ØÙØ ØØÙÙÙÙÙÙØÙÙÙ ØÙÙØØÛØ ÙÙÙØÙÙÙØÙÚÙØØ ØÛÚØÛÙÙÙØÙÚÙØÙÙ ÙÙØ ÚÛÙÙÚ. ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙÚÙØÙÙÚ ØÛÚØÛÙÙÙØÙÙÙ ØÛØÚÛØØÙØ ØÛÚÛÙ \"ØÙØØÛÙØââ\" ØØÙÙØØ ØÙÙØÙØØØ ØÙØÙÙÙÙÙÙØÙÙ \"ØÙØ ØØØÙÙÙÙØÙÙØÙ\" ÙÙ ØØÙÙØÚ."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛÚØÛÙÙÙØÙÙÙ ØÛØÙÙÛ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
 msgid "Unlisted"
 msgstr "ØÙØÙÙÙØÙÙÙØØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
 msgid "_Select your plan:"
 msgstr "ÙÙÙØÙÙÚÙØÙÙ ØØÙÙØÚ(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "ØØÙÙØÙØØÙ ÙÙÙØÙ APN(ØÙÙØØÛØ ÙÛÙØØ ØØØÙ)(_A)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:528
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
-msgstr ""
-"ØØÚØÚÙØÙØÛØÛØ: ÙØØÙØØØ ØÙØ ÙÙÙØÙÙÙ ØØÙÙØØ ÙÛÚ ØÛÙÛØØ ÚÛØØØØØ ÚÛÙ ØÛÙÛØ "
-"ÙÛØÙÙÙØÙ ÙØÙÙ ØØØÙÙÙØÙÙØØÙÙÙÙÙ ÙÛÙØÛØÛÙ ÚÙÙÙØÙØÙ ÙÛÙÙÙÙ.\n"
+msgstr "ØØÚØÚÙØÙØÛØÛØ: ÙØØÙØØØ ØÙØ ÙÙÙØÙÙÙ ØØÙÙØØ ÙÛÚ ØÛÙÛØØ ÚÛØØØØØ ÚÛÙ ØÛÙÛØ ÙÛØÙÙÙØÙ ÙØÙÙ ØØØÙÙÙØÙÙØØÙÙÙÙÙ ÙÛÙØÛØÛÙ ÚÙÙÙØÙØÙ ÙÛÙÙÙÙ.\n"
 "\n"
 "ÙÙÙØÙÙÚÙØÙÙ ØÛØÙ ÙÙÙØÙÙÙØÙÚÙØ ØÛÙÙÙÙÙÚÛÚÙÚÙØØÙÙ ÙÙÙØÙÙÚÙØÙÙÚ APN ØÙÙÙ ØÙØØÚ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
 msgid "Choose your Billing Plan"
 msgstr "ÚÛÙ ØÛÙÛØ ÙÙÙØÙÙÚÙØÙÙ ÙÙØÚÛØÛÚ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
 msgid "My plan is not listed..."
 msgstr "ÙÙÙØÙÙÙ ØÙØÙÙÙÙÙØÛ ÙÙÙ..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 msgid "Select your provider from a _list:"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÚÙØÙÙ ØÙØÙÙÙÙÙØÙÙ ØØÙÙØÚ(_L)Ø"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÙÙÙ ØØÙØÙÙÙØÙ ÛÛ ÙÙÙÛÙØØ ÙÙØÚÛØÛØÙÙ ØÙØØÛÙÙÛÙ(_M):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
 msgid "Provider:"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÙ GSM ØÛØÙÙÙÙØÙÙÙ ØÙØÙÙØÙØÛ(GPRSØ EDGEØ UMTSØ HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:819
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÙ CDMA ØÛØÙÙÙÙØÙÙÙ ØÙØÙÙØÙØÛ(1xRTTØ EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
 msgid "Choose your Provider"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÚÙØÙÙ ØØÙÙØÚ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or Region List:"
 msgstr "ØÛÙÛØ ÙØÙÙ ØØÙÙÙ ØÙØÙÙÙÙÙÙ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "Country or region"
 msgstr "ØÛÙÛØ ÙØÙÙ ØØÙÙÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
 msgid "My country is not listed"
 msgstr "ØÛÙÙØÙÙ ØÙØÙÙÙØÙÙØÙØÛ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
 msgid "Choose your Provider's Country or Region"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙÚÙØÙÙÚ ØÛÙÙØÙ ÙØÙÙ ØØÙÙÙÙÙÙ ØØÙÙØÚ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
 msgid "Installed GSM device"
 msgstr "ØÙØÛÙÙØØØÛØÛÙØØÙ GSM ØÛØÙÛÙÙØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
 msgid "Installed CDMA device"
 msgstr "ØÙØÛÙÙØØØÛØÛÙØØÙ CDMA ØÛØÙÛÙÙØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
-msgstr ""
-"ØÛ ÙØØØÛÙÚÙ ÙØÙÚØØÙÙØ ÙÛÚÙÛ ØÛÙÛÙÙÙ ØÙØÙ(3G) ÙÙ ÙÛÙØÙÙÙÙ ØÛÚØÛÙ ÙÛÚÙÛ ÙÛÚ "
-"ØÛÙÛØØÙØ ØØØÙÙÙÙØÙØ ÙØØØÛÙ ÙÙÙÙØÛ."
+msgstr "ØÛ ÙØØØÛÙÚÙ ÙØÙÚØØÙÙØ ÙÛÚÙÛ ØÛÙÛÙÙÙ ØÙØÙ(3G) ÙÙ ÙÛÙØÙÙÙÙ ØÛÚØÛÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØÙØ ØØØÙÙÙÙØÙØ ÙØØØÛÙ ÙÙÙÙØÛ."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
 msgid "You will need the following information:"
 msgstr "ØØØØÙØÙÙÙ ØÛÚÛØÙØØØØ ØÛÚØÙÙØØÙÚÙØ ÚÛØÙØÛ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
 msgid "Your broadband provider's name"
 msgstr "ÙÛÚ ØÛÙÛØØ ØÛÙÙÙÙÙÚÛÚÙÚÙØÙÙÚ ØØØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Your broadband billing plan name"
 msgstr "ÙÛÚ ØÛÙÛØØ ÚÛÙ ØÛÙÛØ ÙÙÙØÙÙÚÙØ ØØØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr ""
-"(ØÛØÙ ØÛÚÛØÙØØ) ÙÛÚ ØÛÙÛØØ ÚÛÙ ØÛÙÛØ ÙÙÙØÙÙÚÙØÙÙÚ APN(ØÙÙØØÛØ ÙÛÙØØ ØØØÙ) ØÙ"
+msgstr "(ØÛØÙ ØÛÚÛØÙØØ) ÙÛÚ ØÛÙÛØØ ÚÛÙ ØÛÙÛØ ÙÙÙØÙÙÚÙØÙÙÚ APN(ØÙÙØØÛØ ÙÛÙØØ ØØØÙ) ØÙ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ØÛ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ ØÛÚÛÙ ØÙØ ØØØÙÙÙÙØ ÙÛØ(_T):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
 msgid "Any device"
 msgstr "ÚÛØÙØÙØØÙ ØÙØ ØÛØÙÛÙÛ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙÙÙ ØÛÙÙÛ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
 msgid "New Mobile Broadband Connection"
 msgstr "ÙÛÚÙ ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØØØÙÙÙÙØÙ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:367
+msgid "Wired"
+msgstr "ØÙÙÙÙÙ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "ÙÛÙÚÙØ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:402
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:480 ../src/libnm-gtk/nm-ui-utils.c:500
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
 msgid "New..."
 msgstr "ÙÛÚÙâ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
 msgid "C_reate"
 msgstr "ÙÛØ(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
 #, c-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the wireless network "
+#| "'%s'."
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
-"ØÙÙØÙØ ØÙØ '%s' ÙÙ ØÙÙØØÛØ ÙÙÙÙØÙ ØÛÚÛÙ ØÙÙ ÙØÙÙ ØÙÙÙØÙØØ ØØÚÙÛÚÙÙØÙ "
-"ÙÛØÛÙÙÙÙ."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
-msgstr "ØÙÙØÙØ ØÙØ ÙÙÙÙÙÙ ØÛÙØÛØÛØ ØÛÚØÙÙØØÙ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#| msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
-msgstr "ØÙÙØÙØ ØÙØ ÙÙÙÙÙÙ ØÛÙØÛØÛØÙÛ ØÛÚØÙÙØØÙÙÙ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#| msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
-msgstr "ÙÛÚÙ ØÙÙØÙØ ØÙØ ÙÛØ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#| msgid "Create New Wireless Network"
+msgid "Create New Wi-Fi Network"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
-msgstr "ÙÛÚÙ ØÙÙØÙØ ØÙØ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#| msgid "New wireless network"
+msgid "New Wi-Fi network"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
-msgstr "ÙÛØÙØÙÚÙ ØÙÙØØÙ ØÙÙØÙØ ØÙØ ØÛÚÛÙ ØÙØ ØØØ ÙÙØÚÛØÛÚ."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#| msgid "Enter a name for the wireless network you wish to create."
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
-msgstr "ÙÙØÛØÛÙ ØÙÙØÙØ ØÙØØØ ØÛÙØ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#| msgid "Connect to Hidden Wireless Network"
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
-msgstr "ÙÙØÛØÛÙ ØÙÙØÙØ ØÙØ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#| msgid "Hidden wireless network"
+msgid "Hidden Wi-Fi network"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#| msgid ""
+#| "Enter the name and security details of the hidden wireless network you "
+#| "wish to connect to."
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
-"ØÙØ ØØØÙØÙÙØÙÚÙ ØÙÙØØÙ ÙÙØÛØÛÙ ØÙÙØÙØ ØÙØÙÙÚ ØØØÙ ÛÛ ØÙØÛØÛØÙÙÙ ØÛÙØÙÙØØÙÙÙ "
-"ÙÙØÚÛØÛÚ."
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "C_onnection:"
-msgstr "ØØØÙÙÙÙØ(_N):"
+#| msgid "Wireless _security:"
+msgid "Wi-Fi _security:"
+msgstr ""
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
-msgstr "ØÙÙØÙØ ÙØØÙØØØÛØØÛÚ(_A):"
+#: ../src/libnm-gtk/wifi.ui.h:4
+msgid "C_onnection:"
+msgstr "ØØØÙÙÙÙØ(_O):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "ØÙÙØÙØ ØÙØ ØÙØÛØÛØÙÙÙÙ(_W)"
+#| msgid "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
+msgstr ""
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2433,214 +2950,260 @@ msgstr "ØÙØÙÙØÙØ ØÛØÛÙÙ:"
 msgid ""
 "This program is a component of NetworkManager (http://projects.gnome.org/";
 "NetworkManager)."
-msgstr ""
-"ØÛ ÙØÙÚØØÙÙØ NetworkManager ÙØÙÚØØÙÙÙØÙÙÙÚ ØÙØ ØÛÙÙÙÙ(http://projects.gnome.";
-"org/NetworkManager)."
+msgstr "ØÛ ÙØÙÚØØÙÙØ NetworkManager ÙØÙÚØØÙÙÙØÙÙÙÚ ØÙØ ØÛÙÙÙÙ(http://projects.gnome.org/NetworkManager)."
 
 #: ../src/main.c:76
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
-msgstr ""
-"ØÛ ØÛÙØÛÙ ÙÛØ ØØÙÙØØØÛØÛØ ØÛÚÛÙ ÙØÙÙÚÙÙÛÙÚÛÙ ØÙÙÙØØØÙÙØ GNOME ØÛØØÛÙØÛØØÙ "
-"ÙÛÚÙØÙØØ ØÙØØØ ÙÙÙÙØÙØ ØÛÙØÛÙÙØØØÛØÛÙØØÙ."
+msgstr "ØÛ ØÛÙØÛÙ ÙÛØ ØØÙÙØØØÛØÛØ ØÛÚÛÙ ÙØÙÙÚÙÙÛÙÚÛÙ ØÙÙÙØØØÙÙØ ÚÙÙÙÙ ØÛØØÛÙØÛØØÙ ÙÛÚÙØÙØØ ØÙØØØ ÙÙÙÙØÙØ ØÛÙØÛÙÙØØØÛØÛÙØØÙ."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:72
+#| msgid "HSPA"
+msgid "HSPA+"
+msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "LTE"
+
+#: ../src/mb-menu-item.c:112
 msgid "not enabled"
 msgstr "ÙÙØØÙØÙÙÙÙØØÙ"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
 msgid "not registered"
 msgstr "ØÛØÙÙØÙÙÙÙÚÛÙ"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
 #, c-format
 msgid "Home network (%s)"
 msgstr "ØØØ ØÙØ (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
 #, c-format
 msgid "Home network"
 msgstr "ØØØ ØÙØ"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
 msgid "searching"
 msgstr "ØÙØØÛÛØØÙØÛ"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
 msgid "registration denied"
 msgstr "ØÛØÙÙØÙØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ÙÛØÙÛØØÙØÛ)"
 
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ÙÛØÙÛØØÙØÛ)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ØÙØÙÙ ÙÛØÙÛØØÙØÛ (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
 #, c-format
 msgid "Roaming network"
 msgstr "ØÙØÙÙ ÙÛØÙÛØØÙØÛ"
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "ØÛÙÚÙÙÙÛ ÙØØÙØØÚÙÙÙÙ"
+#: ../src/mobile-helpers.c:297
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM ÙØØØÙØÙ â%sâ (â%sâ ÙÙÚØÙÙÙ) ÙÙÚ PIN ÙÙØÙ"
 
-#: ../src/utils/nmn-mobile-providers.c:510
-msgid "Default"
-msgstr "ÙÛÚÛÙØÙÙÙ"
+#: ../src/mobile-helpers.c:471
+msgid "PIN code required"
+msgstr "PIN ÙÙØÙ ØÛÚØÙÙØØÙÙÙ"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"ØÙØ ØØØÙÛØØÛÚ ÙÙÙÙØÙÚØÙ ØÛØÙ ØÛÚØÙÙØØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØØÙØÙÙÙØÙ(ui. ÚÛØØÙØÙ "
-"ØÛÙÙÙÙÙØÙ)."
+#: ../src/mobile-helpers.c:479
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ÙÛÚÙÛ ÙÛÚ ØÛÙÛØØ ØÛØÙÛÙÙØÙ ØÛÚÛÙ PIN ÙÙØÙ ÙÛØÛÙ"
 
-#: ../src/wireless-security/eap-method.c:279
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:174
+#, c-format
+#| msgid "DSL connection %d"
+msgid "%s connection"
+msgstr "%s ØØØÙÙÙÙØ"
+
+#: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "ÚÛÛØÚÙØÙÛ ØØØÙØØÙØÙ ØÙØÚØÙ ÚÛÛØÚÙØÙÙØÙÙÙ ØØÙÙÙÙÙØÙ"
 
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/wireless-security/eap-method.c:276
+#| msgid ""
+#| "Not using a Certificate Authority (CA) certificate can result in "
+#| "connections to insecure, rogue wireless networks.  Would you like to "
+#| "choose a Certificate Authority certificate?"
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
 msgstr ""
-"ØÛÙØÛØÛØ ÙÛØÙÙØÙ(CA)ÙÙÚ ÚÛÛØÚÙØÙÙØÙÙÙ ØÙØÙÛØÙÛØÙÙÙ ØÙØÛØÛØ ØÙÙÙÙØØÙØ ÙÛØÙÛÙ "
-"ØÙÙØÙØ ØÙØØØ ØØØÙØÙ ÙÙÙÛØÙ ÙÛÙÙÙÙ. ØÛÙØÛØÛØ ÙÛØÙÙØÙÙÙÚ ÚÛÛØÚÙØÙÙØÙÙÙ "
-"ØØÙÙØØÙÙ ØÙØØÛÙØÙØØ"
 
-#: ../src/wireless-security/eap-method.c:289
+#: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
 msgstr "CA ÚÛÛØÚÙØÙÙØÙ ØØÙÙØ"
 
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:645
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DERØ PEM ÙØÙÙ PKCS#12 ØÛØØÙÙ ØØÚÙÛÚÙØØ(*.derØ *.pemØ*.p12)"
 
-#: ../src/wireless-security/eap-method.c:651
+#: ../src/wireless-security/eap-method.c:648
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ÙØÙÙ PEM ÚÛÛØÚÙØÙÙØÙ(der.*Ø pem.*Ø crt.*Ø cer.*)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
-
+#: ../src/wireless-security/eap-method-fast.c:261
 #: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "ØÙØ ÚÛÛØÚÙØÙÛ ØÛÙØÛØÛØ ÚÛÛØÚÙØÙÙØÙ ØØÙÙØ..."
+#: ../src/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "PAC ÚÛØØÙØÙÙÙ ØØÙÙØÚâ"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC ÚÛØØÛØÙÙØÙ(*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr "ÚÛÙÙÛ ÚÛØØÛØÙÛØ"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#| msgid "Anony_mous identity:"
+msgid "Anonymous"
+msgstr "ØØØØÙØ"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#| msgid "Authentication"
+msgid "Authenticated"
+msgstr "ØØÙØÚÙÙÙØÙ ØÛÙÙÙÙÛÙÚÛÙ"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+msgid "Both"
+msgstr "ØÙÙÙÙÙÙØÙ"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-peap.ui.h:5
 #: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "Anony_mous identity:"
 msgstr "ØØØØÙØ ÙÙÙÙÙÙ:(_M)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "C_A ÚÛÛØÚÙØÙÙØÙ:"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr "PAC ÚÛØØÙØÙ(_F):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:7
 #: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
-msgstr "ØÙÚÙÙ ØÛÙØÛØÛØ(_N):"
+#| msgid "I_nner authentication:"
+msgid "_Inner authentication:"
+msgstr "ØÙÚÙÙ ØÙØÙØØ"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "ØØÙØÙÙØØÙÙ PAC ØÛÙÙÙÙÛØ"
+
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:382
+msgid "MD5"
+msgstr "MD5"
+
+#: ../src/wireless-security/eap-method-peap.c:350
+#: ../src/wireless-security/eap-method-tls.c:434
+#: ../src/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr "ØÙØ ÚÛÛØÚÙØÙÛ ØÛÙØÛØÛØ ÚÛÛØÚÙØÙÙØÙ ØØÙÙØ..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "0-ÙÛØØÙ"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "ÙÛØØÙ 1"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "C_A ÚÛÛØÚÙØÙÙØÙ:"
+
 #: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
-msgstr "PEAP ÙÛØØÙ(_P):"
+#| msgid "_PEAP version:"
+msgid "PEAP _version:"
+msgstr "PEAP ÙÛØØÙ(_V):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
+#: ../src/wireless-security/eap-method-simple.ui.h:3
 msgid "As_k for this password every time"
 msgstr "ØÛ ØÙÙÙÙ ÚÛØ ÛØÙÙØ ØÙØÙØÛÙ(_K)"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
 msgid "Unencrypted private keys are insecure"
 msgstr "ØÙÙÙØÙØÙÙÙØØÙ ØÛØØÙÙ ØØÚÙÛÚÙØØ ØÙØÛØÛØ ØÛÙÛØ"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
 "a password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
-msgstr ""
-"ØØÙÙÙØØÙ ØÛØØÙÙ ØØÚÙÛÚ ØÙØ ÙØØÙÙ ØÛØÙÙÙØÙÙ ÙÙØØØÙÙÙØØÙØÛÙ ÙÙÙÙØÛ. ØÛ ØÙØÙÙÚ "
-"ØÙØÛØÛØÙÙÙ ÙÙÙÙÙÙÙÚÙØÚÛ ØÛØÙØ ÙÙÙÙØÛ. ØÙØ ØÙÙ ØØÙÙØÙ ØÛØØÙÙ ØØÚÙÛÚÙÚÙØÙÙ "
-"ÙÙØØØÚ.(ØÛØØÙÙ ØØÚÙÛÚÙÚÙØÙÙ openssl ØØØÙÙÙÙÙ ØÙÙÙÙÙ ÙÙØØÙÙØÙØÙØÙØ)"
+msgstr "ØØÙÙÙØØÙ ØÛØØÙÙ ØØÚÙÛÚ ØÙØ ØÙÙ ØÛØÙÙÙØÙÙ ÙÙØØØÙÙÙØØÙØÛÙ ÙÙÙÙØÛ. ØÛ ØÙØÙÙÚ ØÙØÛØÛØÙÙÙ ØÙØÙØØÙØÙÙÚÙØÚÛ ØÛØÙØ ÙÙÙÙØÛ. ØÙØ ØÙÙ ØØÙÙØÙ ØÛØØÙÙ ØØÚÙÛÚÙÚÙØÙÙ ÙÙØØØÚ.(ØÛØØÙÙ ØØÚÙÛÚÙÚÙØÙÙ openssl ØØØÙÙÙÙÙ ØÙÙÙÙÙ ÙÙØØÙÙØÙØÙØÙØ)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
 msgid "Choose your personal certificate..."
 msgstr "ØÛØÛØÙÙ ÚÛÛØÚÙØÙÙÚÙØÙÙ ØØÙÙØÚ..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
 msgid "Choose your private key..."
 msgstr "ØÛØØÙÙ ØØÚÙÛÚÙÚÙØÙÙ ØØÙÙØÚ:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "ÙÙÙÙÙÙ(_I):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "ØÙØÙÛØÙÛÚÙ ÚÛÛØÚÙØÙÙØÙ(_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:4
 msgid "Private _key:"
 msgstr "ØÛØØÙÙ ØØÚÙÛÚ(_K)"
 
@@ -2648,10 +3211,6 @@ msgstr "ØÛØØÙÙ ØØÚÙÛÚ(_K)"
 msgid "_Private key password:"
 msgstr "ØÛØØÙÙ ØØÚÙÛÚ ØÙÙÙ(_P):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "ØÙØÙÛØÙÛÚÙ ÚÛÛØÚÙØÙÙØÙ(_U):"
-
 #: ../src/wireless-security/nag-user-dialog.ui.h:1
 msgid "Don't _warn me again"
 msgstr "ÙÛÙÙ ÙÛÙÛ ØØÚØÚÙØÙØÛØÙØ(_W)"
@@ -2664,62 +3223,147 @@ msgstr "ÙØÙ"
 msgid "Yes"
 msgstr "ÚÛØÛ"
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:394
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:418
+msgid "FAST"
+msgstr "FAST"
+
+#: ../src/wireless-security/wireless-security.c:429
 msgid "Tunneled TLS"
-msgstr "ØÙÙÛÙ TLS"
+msgstr "ØÙÙÙÙ TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:440
 msgid "Protected EAP (PEAP)"
 msgstr "ÙÙØØÙÙÙØÙØØÙ EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-msgid "_Authentication:"
-msgstr "ØÛÙØÛØÛØ"
+#| msgid "_Authentication:"
+msgid "Au_thentication:"
+msgstr "ÙÙÙÙÙÙ ØÛÙÙÙÙÛØ(_T):"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "Open System"
+msgstr "ØÙÚÛÙ ØÙØØÛÙØ"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "Shared Key"
+msgstr "ÚÛÙØÛÚÙØÙÛÙÚÛÙ ØØÚÙÛÚ"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (ÙÛÚÛÙØÙÙÙ)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "4"
 msgstr "4"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "Open System"
-msgstr "ØÙÚÛÙ ØÙØØÛÙØ"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "Shared Key"
-msgstr "ÚÛÙØÛÚÙØÙÛÙÚÛÙ ØØÚÙÛÚ"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "ØØÚÙÛÚ(_K):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "ØØÚÙÛÚÙÙ ÙÛØØÛØ(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP ØÙÙØÛÙØÙ(_X):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "ØØÚÙÛÚ(_K):"
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ØÙÙØÙØ ØÙØÙØØ (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ØÙÙØÙØ ØÙØ (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "ØÙÙØÙØ ØÙØ"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "ØÙÙØÙØ ØÙØ ÚÛÙÙÛÙÚÛÙ"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "ØÙÙØÙØ ØÙØ ÙØØØÙÙ ØÛØÚØØ ØÛØÙÙÙØÙÙ ÚÛÙÙÛÙÚÛÙ"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "ØÙØ ØÙÙØÙØ ØÙØØØ ØØØÙÙÙÙØ ØÛÚÛÙ ØÛ ØÙÙØÛÙÚÙÙÙ ÚÛÙÙÚ"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÙÙØØÙÙÙÙÛØØÙØÛâ"
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØÛÙÙÙÙÙÛØØÙØÛâ"
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "''%s' ØÛÚÛÙ ØÙØ ØÙÙØÙØ ØÙØ ØØØØÛØÙ ØÙÙØÙÙØØ ÙÙÙÙÛØØÙØÛâ"
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "ØÙÙØÙØ ØÙØ ØØØÙÙÙÙØÙ '%s' ØØÙØÙÙ"
+
+#~ msgid "PI_N:"
+#~ msgstr "PIN(_N):"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "_SSID:"
+#~ msgstr "SSID (_S):"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "ØÙÙÙÙÙ ØÙØÛØÛØÙÙÙÙ ØÙØÛØÛØÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØØÙÛØÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ."
+
+#~ msgid "Wireless"
+#~ msgstr "ØÙÙØÙØ"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "ØÙÙØÙØ ØØØÙÙÙÙØÙ %d"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "ØØØÙÙÙ ØÙØÙÛØÙÛÚÙÙÛØ ØÙØÙÙØÛÙÛÙØÛ"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "ØØÙØÙÙØØÙÙ ØØØÙØÙ(_A)"
+
+#~ msgid "_Import"
+#~ msgstr "ØÙÙÙÙØØ ÙÙÙ(_I)"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ ÙÛØÛÙØÙ."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "ØÙÙÙÙØØ ÙÙÙÙÙØØÙ ØØØÙÙÙÙØÙÙ ØÛÚØÙØÙÙÙÛÙÙÙØÙ"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØØÙ VPN ÙÙØØÛØÙÙØÙ ÙÙÙ. ØÛ ØÙÙÚÙÙÙ ÙÙØØÙØÙØ ØÛÚÛÙ ØÙØÙÙ "
+#~ "ØÙØÙÙØÙÚ."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Â%s ØÛÚÛÙ ØØØÙÙÙÙØÙÙ ÙØÙØØÙ ØÛÚØÙØÙÛØÙÙ ØÙÙÙÙØÙ"
+
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "ÙÛÙÚÙØ ØÛØÙÛÙÙØÙ ØÛÙÙÙÙÙØÙ."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "ÙÛÙÚÙØ ØÛÙÙÙÙÙÙÙØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙÙØÙ(D-Bus ÛØÙØÙÛØÚÙ ÙÛØÛØ ÙÛØÙÛÙ "
+#~ "ØÙÙØÙ)"
 
-#~ msgid "C_onnect"
-#~ msgstr "ØØØÙØ(_O)"
+#~ msgid "United Kingdom"
+#~ msgstr "ØÛÙÚÙÙÙÛ ÙØØÙØØÚÙÙÙÙ"
 
 #~ msgid "Other Wireless Network..."
 #~ msgstr "ØØØÙØ ØÙÙØÙØ ØÙØ..."



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]