[network-manager-applet] update Simplified Chinese (zh_CN) translation

[YunQiang Su <yqsu src gnome org>]

commit c05884761a5bf72843934ea41b301780ee13e1a9
Author: tuhaihe <wangdianjin linuxdeepin com>
Date:   Sat Sep 15 11:16:34 2012 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po |  698 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 374 insertions(+), 324 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3566081..7a44a14 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,14 +19,14 @@ 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: 2012-04-13 19:22+0000\n"
-"PO-Revision-Date: 2012-04-14 20:29+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2012-09-05 13:35+0000\n"
+"PO-Revision-Date: 2012-08-26 10:32+0800\n"
+"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
@@ -37,75 +37,101 @@ msgstr "çç"
 msgid "Manage your network connections"
 msgstr "ççççèæ"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "ççèæ"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "ççææææçççèæèç"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
-msgstr "ççèæéå"
+msgstr "ççèæéç"
 
-#: ../nm-applet.schemas.in.h:2
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "åæéèä TRUE äççèæåääççææççéåã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "åæéèä true äççèæåääççææççéçã"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
-msgstr "ççæåéå"
+msgstr "ççæåéç"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "åæéèä true äççäääççæåææççéçã"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+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."
-msgstr "åæéèä TRUE äççäääççæåææççéåã"
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "åæéèä true äççèæææå VPN æçéçã"
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
-msgstr "ççççåçéå"
+msgstr "ççççåçéç"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
+"Set this to true to disable notifications when wireless networks are "
 "available."
-msgstr "åæéèå TRUE äççæçççåçææççéåã"
+msgstr "åæéèä true äççæçççåçææççéçã"
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "æéæ"
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "çäååèçæååèèçèääæçæã"
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "çç WiFi åç"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "åæéèä TRUE äçæäçååççåæåç adhoc ççã"
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "èä true äçæäçåçåæåå adhoc ççã"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "ççèæ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Ignore CA certificate"
+msgstr "åç CA èä"
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "ççææææçççèæèç"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "åæéèä true äççå EAP èèäåä CA èäçèåã"
+
+#: ../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 "åæéèä true äççå EAP èèç 2 éæäåä CA èäçèåã"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:864 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "åçç"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-gsm.c:486 ../src/applet-device-wired.c:269
 #: ../src/applet-device-wimax.c:423
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "æçååèæåâ%sâã"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1268 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "èæååç"
 
@@ -113,49 +139,49 @@ msgstr "èæååç"
 msgid "You are now connected to the mobile broadband network."
 msgstr "æçååèæåçåååççã"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "æåååçåååèæâ%sâ..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "æåéççåååèæâ%sâ..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "çåååèæâ%sâéèçæèè..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2504
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
+#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2500
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "æåäâ%sâèæääççåå..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-gsm.c:553
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "çåååèæâ%sâååäæåçæ"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
 #: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "çååå(%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
 #: ../src/connection-editor/page-mobile.c:379
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
 #: ../src/connection-editor/nm-connection-list.c:1510
@@ -163,87 +189,88 @@ msgid "Mobile Broadband"
 msgstr "çååå"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:412
+#: ../src/applet-device-cdma.c:409
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "æåçååå(CDMA)èæ..."
 
-#: ../src/applet-device-cdma.c:446
+#: ../src/applet-device-cdma.c:443
 msgid "You are now connected to the CDMA network."
 msgstr "æçååèæå CDMA ççã"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
 #: ../src/applet-device-wimax.c:482
 #, 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:553
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "ææä"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
 msgid "CDMA network."
 msgstr "CDMA ççã"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
+# èéç"home network"ääéçâææççâæåæçåéïååäæçåäåæèæäèäâäççâæèçéã
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
 msgid "You are now registered on the home network."
-msgstr "æçååæååååççã"
+msgstr "æçååæååäççã"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
 msgid "You are now registered on a roaming network."
 msgstr "æçååæååääææççã"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-gsm.c:211 ../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:459
+#: ../src/applet-device-gsm.c:457
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æåçååå(GSM)èæ..."
 
-#: ../src/applet-device-gsm.c:493
+#: ../src/applet-device-gsm.c:491
 msgid "You are now connected to the GSM network."
 msgstr "æçååèæå GSM ççã"
 
-#: ../src/applet-device-gsm.c:654
+#: ../src/applet-device-gsm.c:652
 msgid "PIN code required"
 msgstr "éè PIN ç"
 
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-gsm.c:660
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "çåååèåéè PIN çã"
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet-device-gsm.c:781
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "%2$s ä SIM å %1$s ç PIN ç"
 
-#: ../src/applet-device-gsm.c:875
+#: ../src/applet-device-gsm.c:873
 msgid "Wrong PIN code; please contact your provider."
 msgstr "éèç PIN äçïèèçæçäååã"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:896
 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:925
+#: ../src/applet-device-gsm.c:923
 msgid "Sending unlock code..."
 msgstr "æååéèéç..."
 
-#: ../src/applet-device-gsm.c:988
+#: ../src/applet-device-gsm.c:986
 msgid "SIM PIN unlock required"
 msgstr "éèèé SIM PIN"
 
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet-device-gsm.c:987
 msgid "SIM PIN Unlock Required"
 msgstr "éèèé SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
+#: ../src/applet-device-gsm.c:989
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -251,25 +278,25 @@ msgid ""
 msgstr "çåååèåâ%sâååääçäåéèää SIM PIN çã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
+#: ../src/applet-device-gsm.c:991
 msgid "PIN code:"
 msgstr "PIN äçï"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
+#: ../src/applet-device-gsm.c:995
 msgid "Show PIN code"
 msgstr "æç PIN ç"
 
-#: ../src/applet-device-gsm.c:1000
+#: ../src/applet-device-gsm.c:998
 msgid "SIM PUK unlock required"
 msgstr "éèèé SIM PUK"
 
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet-device-gsm.c:999
 msgid "SIM PUK Unlock Required"
 msgstr "éèèé SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-gsm.c:1001
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -277,26 +304,26 @@ msgid ""
 msgstr "çåååèåâ%sâååääçäåéèää SIM PUK çã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
+#: ../src/applet-device-gsm.c:1003
 msgid "PUK code:"
 msgstr "PUK çï"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
+#: ../src/applet-device-gsm.c:1006
 msgid "New PIN code:"
 msgstr "æç PIN çï"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
+#: ../src/applet-device-gsm.c:1008
 msgid "Re-enter new PIN code:"
 msgstr "åæèåæç PIN çï"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
+#: ../src/applet-device-gsm.c:1013
 msgid "Show PIN/PUK codes"
 msgstr "æç PIN/PUK çï"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
 msgid "GSM network."
 msgstr "GSM ççã"
 
@@ -323,7 +350,7 @@ msgid "Wired Network"
 msgstr "æççç"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1510
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
 msgid "disconnected"
 msgstr "åæå"
 
@@ -364,103 +391,103 @@ msgstr "DSL èè"
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "èæåéèçæçèæ(_C)..."
 
-#: ../src/applet-device-wifi.c:150
+#: ../src/applet-device-wifi.c:148
 msgid "Create _New Wireless Network..."
 msgstr "ååæçæççç(_N)..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:292
 msgid "(none)"
 msgstr "(æ)"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:790
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "æççç(%s)"
 
-#: ../src/applet-device-wifi.c:794
+#: ../src/applet-device-wifi.c:792
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "æççç(%s)"
 
-#: ../src/applet-device-wifi.c:796
+#: ../src/applet-device-wifi.c:794
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "æççç"
 
-#: ../src/applet-device-wifi.c:829
+#: ../src/applet-device-wifi.c:827
 msgid "wireless is disabled"
 msgstr "æçççåçç"
 
-#: ../src/applet-device-wifi.c:830
+#: ../src/applet-device-wifi.c:828
 msgid "wireless is disabled by hardware switch"
 msgstr "æçççåéèçäååçç"
 
-#: ../src/applet-device-wifi.c:891
+#: ../src/applet-device-wifi.c:889
 msgid "More networks"
 msgstr "æåçç"
 
-#: ../src/applet-device-wifi.c:1071
+#: ../src/applet-device-wifi.c:1068
 msgid "Wireless Networks Available"
 msgstr "æçççåç"
 
-#: ../src/applet-device-wifi.c:1072
+#: ../src/applet-device-wifi.c:1069
 msgid "Use the network menu to connect to a wireless network"
 msgstr "äçççèåèæåæççç"
 
-#: ../src/applet-device-wifi.c:1075 ../src/applet.c:926
+#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
 msgid "Don't show this message again"
 msgstr "äåæçæäæ"
 
-#: ../src/applet-device-wifi.c:1267
+#: ../src/applet-device-wifi.c:1263
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "æçååèæåæççç '%s'ã"
 
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1294
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "æåååæçççèæâ%sâ..."
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1297
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "æåéçæçççèæâ%sâ..."
 
-#: ../src/applet-device-wifi.c:1304
+#: ../src/applet-device-wifi.c:1300
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "æçççâ%sâéèçæèè..."
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1303
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "æåäâ%sâèæääæçççåå..."
 
-#: ../src/applet-device-wifi.c:1328
+#: ../src/applet-device-wifi.c:1324
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "æçççèæâ%sâåäæåçæï%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1333
+#: ../src/applet-device-wifi.c:1329
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "æçççèæâ%sâåäæåçæ"
 
-#: ../src/applet-device-wifi.c:1381
+#: ../src/applet-device-wifi.c:1377
 msgid "Failed to activate connection"
 msgstr "ææåçèæ"
 
-#: ../src/applet-device-wifi.c:1383 ../src/applet-device-wifi.c:1402
-#: ../src/applet.c:492 ../src/applet.c:536 ../src/applet.c:562
+#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
 msgid "Unknown error"
 msgstr "æçéè"
 
-#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1405
-#: ../src/applet.c:495 ../src/applet.c:565
+#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:493 ../src/applet.c:563
 msgid "Connection failure"
 msgstr "èæåè"
 
-#: ../src/applet-device-wifi.c:1400
+#: ../src/applet-device-wifi.c:1396
 msgid "Failed to add new connection"
 msgstr "æææåæèæ"
 
@@ -694,8 +721,8 @@ msgid ""
 "Copyright  2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"çæææ (C) 2004-2011 Red Hatåå\n"
-"çæææ (C) 2005-2008 Novellåå\n"
+"çæææ (C) 2004-2011 Red Hat åå\n"
+"çæææ (C) 2005-2008 Novell åå\n"
 "ååääåçåèçèåçèè"
 
 #: ../src/applet-dialogs.c:942
@@ -724,23 +751,23 @@ msgstr "èæåâ%sâéèåçã"
 msgid "Password:"
 msgstr "åçï"
 
-#: ../src/applet.c:490
+#: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "æææå/åçèæ"
 
-#: ../src/applet.c:534
+#: ../src/applet.c:532
 msgid "Device disconnect failed"
 msgstr "èåæååè"
 
-#: ../src/applet.c:539
+#: ../src/applet.c:537
 msgid "Disconnect failure"
 msgstr "æååè"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:558
 msgid "Connection activation failed"
 msgstr "èæåçåè"
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -750,7 +777,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãççèæèäæã"
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:1016
 #, c-format
 msgid ""
 "\n"
@@ -759,7 +786,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãVPN æåååäæã"
 
-#: ../src/applet.c:1021
+#: ../src/applet.c:1019
 #, c-format
 msgid ""
 "\n"
@@ -769,7 +796,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãVPN æåèåäääéæéçã"
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -778,7 +805,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãèæèæã"
 
-#: ../src/applet.c:1027
+#: ../src/applet.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -787,7 +814,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãVPN æåæåæéæéåååã"
 
-#: ../src/applet.c:1030
+#: ../src/applet.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -796,7 +823,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãVPN æååååèã"
 
-#: ../src/applet.c:1033
+#: ../src/applet.c:1031
 #, c-format
 msgid ""
 "\n"
@@ -805,7 +832,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãææåæç VPN secretã"
 
-#: ../src/applet.c:1036
+#: ../src/applet.c:1034
 #, c-format
 msgid ""
 "\n"
@@ -814,7 +841,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèãVPN secret éæã"
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -823,7 +850,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåèã"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:1059
 #, c-format
 msgid ""
 "\n"
@@ -833,7 +860,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåæåãççèæèäæã"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -842,7 +869,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåæåãVPN æåååæã"
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:1068
 #, c-format
 msgid ""
 "\n"
@@ -851,7 +878,7 @@ msgstr ""
 "\n"
 "VPN èæâ%sâåæåã"
 
-#: ../src/applet.c:1100
+#: ../src/applet.c:1098
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -862,19 +889,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1102
+#: ../src/applet.c:1100
 msgid "VPN connection has been successfully established.\n"
 msgstr "åæååç VPN èæã\n"
 
-#: ../src/applet.c:1104
+#: ../src/applet.c:1102
 msgid "VPN Login Message"
 msgstr "VPN çåææ"
 
-#: ../src/applet.c:1110 ../src/applet.c:1118 ../src/applet.c:1168
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
 msgid "VPN Connection Failed"
 msgstr "VPN èæåè"
 
-#: ../src/applet.c:1175
+#: ../src/applet.c:1173
 #, c-format
 msgid ""
 "\n"
@@ -887,7 +914,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1178
+#: ../src/applet.c:1176
 #, c-format
 msgid ""
 "\n"
@@ -900,139 +927,139 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1498
+#: ../src/applet.c:1496
 msgid "device not ready (firmware missing)"
 msgstr "èåæåç(çååä)"
 
-#: ../src/applet.c:1500
+#: ../src/applet.c:1498
 msgid "device not ready"
 msgstr "èåæåç"
 
-#: ../src/applet.c:1526
+#: ../src/applet.c:1524
 msgid "Disconnect"
 msgstr "æå"
 
-#: ../src/applet.c:1540
+#: ../src/applet.c:1538
 msgid "device not managed"
 msgstr "èåææç"
 
-#: ../src/applet.c:1584
+#: ../src/applet.c:1582
 msgid "No network devices available"
 msgstr "ææåççççèå"
 
-#: ../src/applet.c:1672
+#: ../src/applet.c:1670
 msgid "_VPN Connections"
 msgstr "_VPN èæ"
 
-#: ../src/applet.c:1729
+#: ../src/applet.c:1727
 msgid "_Configure VPN..."
 msgstr "éç VPN(_C)..."
 
-#: ../src/applet.c:1733
+#: ../src/applet.c:1731
 msgid "_Disconnect VPN"
 msgstr "æå VPN(_D)"
 
-#: ../src/applet.c:1831
+#: ../src/applet.c:1825
 msgid "NetworkManager is not running..."
 msgstr "ççççåæèè..."
 
-#: ../src/applet.c:1836 ../src/applet.c:2635
+#: ../src/applet.c:1830 ../src/applet.c:2631
 msgid "Networking disabled"
 msgstr "ççåçç"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2057
+#: ../src/applet.c:2051
 msgid "Enable _Networking"
 msgstr "åçèç(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2066
+#: ../src/applet.c:2060
 msgid "Enable _Wireless"
 msgstr "åçæç(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2069
 msgid "Enable _Mobile Broadband"
 msgstr "åççååå(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2078
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "åç WiMA_X çååå"
 
 #. Toggle notifications item
-#: ../src/applet.c:2095
+#: ../src/applet.c:2089
 msgid "Enable N_otifications"
 msgstr "åçéç(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2106
+#: ../src/applet.c:2100
 msgid "Connection _Information"
 msgstr "èæäæ(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2116
+#: ../src/applet.c:2110
 msgid "Edit Connections..."
 msgstr "çèèæ..."
 
 #. Help item
-#: ../src/applet.c:2130
+#: ../src/applet.c:2124
 msgid "_Help"
 msgstr "åå(_H)"
 
 #. About item
-#: ../src/applet.c:2139
+#: ../src/applet.c:2133
 msgid "_About"
 msgstr "åä(_A)"
 
-#: ../src/applet.c:2316
+#: ../src/applet.c:2310
 msgid "Disconnected"
 msgstr "åæåèæ"
 
-#: ../src/applet.c:2317
+#: ../src/applet.c:2311
 msgid "The network connection has been disconnected."
 msgstr "ççèæçåæåã"
 
-#: ../src/applet.c:2498
+#: ../src/applet.c:2494
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "æåååççèæâ%sâ..."
 
-#: ../src/applet.c:2501
+#: ../src/applet.c:2497
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ççèæâ%sâéèçæèè..."
 
-#: ../src/applet.c:2507
+#: ../src/applet.c:2503
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ççèæâ%sâååäæåçæ"
 
-#: ../src/applet.c:2590
+#: ../src/applet.c:2586
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "æååå VPN èæâ%sâ..."
 
-#: ../src/applet.c:2593
+#: ../src/applet.c:2589
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN èæâ%sâéèçæèè..."
 
-#: ../src/applet.c:2596
+#: ../src/applet.c:2592
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "æåäâ%sâèæää VPN åå..."
 
-#: ../src/applet.c:2599
+#: ../src/applet.c:2595
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN èæâ%sâååäæåçæ"
 
-#: ../src/applet.c:2640
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "ææççèæ"
 
-#: ../src/applet.c:3354
+#: ../src/applet.c:3336
 msgid "NetworkManager Applet"
 msgstr "ççççååçå"
 
@@ -1189,11 +1216,15 @@ 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 "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 servers:"
 msgstr "_DNS æååï"
 
@@ -1312,7 +1343,7 @@ msgstr "åç"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
 msgid "_Use point-to-point encryption (MPPE)"
-msgstr "äççåçåå (MPPE)(_U)"
+msgstr "äççåçåå(MPPE)(_U)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "_Require 128-bit encryption"
@@ -1446,7 +1477,7 @@ msgstr "äèåç(_W)ï"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid "Mb/s"
-msgstr "Mb/s"
+msgstr "Mb/ç"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "_Rate:"
@@ -1564,20 +1595,20 @@ msgstr "æå..."
 
 #: ../src/connection-editor/ip4-routes-dialog.c:745
 #: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+#: ../src/connection-editor/page-ip4.c:911
+#: ../src/connection-editor/page-ip6.c:877
 msgid "Address"
 msgstr "åå"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/page-ip4.c:928
 msgid "Netmask"
 msgstr "åçæç"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:779
 #: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/page-ip6.c:911
 msgid "Gateway"
 msgstr "çå"
 
@@ -1587,7 +1618,7 @@ msgid "Metric"
 msgstr "åå"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/page-ip6.c:894
 msgid "Prefix"
 msgstr "åç"
 
@@ -1601,7 +1632,7 @@ msgstr "DSL"
 msgid "Could not load DSL user interface."
 msgstr "ææåè DSL çæçéã"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:232
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL èæ %d"
@@ -1653,16 +1684,26 @@ msgstr "äæåèæ"
 msgid "Disabled"
 msgstr "åçç"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:296
+msgid "Additional _DNS servers:"
+msgstr "éå _DNS æååï"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:305
+msgid "Additional s_earch domains:"
+msgstr "éåæçå(_E)ï"
+
+#: ../src/connection-editor/page-ip4.c:843
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "æåçè %s ç IPv4 èç"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:992
 msgid "IPv4 Settings"
 msgstr "IPv4 èç"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:994
 msgid "Could not load IPv4 user interface."
 msgstr "ææåè IPv4 çæçéã"
 
@@ -1671,7 +1712,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 "åç"
 
@@ -1679,16 +1720,16 @@ msgstr "åç"
 msgid "Automatic, DHCP only"
 msgstr "èåïä DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:809
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "æåçè %s ç IPv6 èç"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:956
 msgid "IPv6 Settings"
 msgstr "IPv6 èç"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:958
 msgid "Could not load IPv6 user interface."
 msgstr "ææåè IPv6 çæçéã"
 
@@ -1713,11 +1754,11 @@ msgstr "éææççåååæäåäççææãåäçåïèè
 
 #: ../src/connection-editor/page-mobile.c:679
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "æçæäåäçåä _GSM çææ(å: GPRS, EDGE, UMTS, HSDPA)"
+msgstr "æçæäåäçåä _GSM çææ(å GPRSãEDGEãUMTSãHSDPA)"
 
 #: ../src/connection-editor/page-mobile.c:686
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "æçæäåäçåä C_DMA çææ(åï1xRTT, EVDO)"
+msgstr "æçæäåäçåä C_DMA çææ(å 1xRTTãEVDO)"
 
 #: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
@@ -1784,8 +1825,8 @@ msgstr "æææååçäâ%sâç VPN æäæåã"
 msgid "VPN connection %d"
 msgstr "VPN èæ %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-wired.c:91
+#: ../src/connection-editor/page-wireless.c:95
 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"
@@ -1793,17 +1834,17 @@ msgstr ""
 "æééååæèæéåèäåæèåç MAC ååæåçççèåãäåï"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wired.c:272
+#: ../src/connection-editor/page-wired.c:271
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 #: ../src/connection-editor/nm-connection-list.c:1502
 msgid "Wired"
 msgstr "æç"
 
-#: ../src/connection-editor/page-wired.c:274
+#: ../src/connection-editor/page-wired.c:273
 msgid "Could not load wired user interface."
 msgstr "ææåèæççççæçéã"
 
-#: ../src/connection-editor/page-wired.c:449
+#: ../src/connection-editor/page-wired.c:448
 #, c-format
 msgid "Wired connection %d"
 msgstr "æçèæ %d"
@@ -1820,29 +1861,29 @@ msgstr "ææåèâæçççååæâååæçæçéã"
 msgid "Use 802.1_X security for this connection"
 msgstr "åæèæäç 802.1_X ååæ"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
+#: ../src/connection-editor/page-wireless.c:172
+#: ../src/connection-editor/page-wireless.c:176
+#: ../src/connection-editor/page-wireless.c:197
 #, c-format
 msgid "default"
 msgstr "éè"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wireless.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
+#: ../src/connection-editor/page-wireless.c:455
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 #: ../src/connection-editor/nm-connection-list.c:1506
 msgid "Wireless"
 msgstr "æç"
 
-#: ../src/connection-editor/page-wireless.c:459
+#: ../src/connection-editor/page-wireless.c:457
 msgid "Could not load WiFi user interface."
 msgstr "ææåè WiFi çæçéã"
 
-#: ../src/connection-editor/page-wireless.c:663
+#: ../src/connection-editor/page-wireless.c:661
 #, c-format
 msgid "Wireless connection %d"
 msgstr "æçèæ %d"
@@ -1874,7 +1915,7 @@ msgstr "WPA å WPA2 ää"
 
 #: ../src/connection-editor/page-wireless-security.c:395
 msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "ææåè WiFi ååæçæçéïçå WiFi èåã"
+msgstr "ææåè WiFi ååæçæçéïçå WiFi èçã"
 
 #: ../src/connection-editor/page-wireless-security.c:405
 msgid "Wireless Security"
@@ -1884,38 +1925,38 @@ msgstr "æçååæ"
 msgid "Could not load WiFi security user interface."
 msgstr "ææåè WiFi ååæçæçéã"
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/nm-connection-editor.c:102
 #, c-format
 msgid "Editing %s"
 msgstr "æåçè %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:105
+#: ../src/connection-editor/nm-connection-editor.c:106
 msgid "Editing un-named connection"
 msgstr "çèæååèæ"
 
-#: ../src/connection-editor/nm-connection-editor.c:291
+#: ../src/connection-editor/nm-connection-editor.c:292
 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:394
+#: ../src/connection-editor/nm-connection-editor.c:395
 msgid "Error creating connection editor dialog."
 msgstr "ååèæçèååèæåéã"
 
-#: ../src/connection-editor/nm-connection-editor.c:406
+#: ../src/connection-editor/nm-connection-editor.c:407
 msgid "_Save"
 msgstr "äå(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:407
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "Save any changes made to this connection."
 msgstr "äååæèæçåéææã"
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:409
 msgid "_Save..."
 msgstr "äå(_S)..."
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "äææææçæäåæèæéèèèã"
 
@@ -1929,7 +1970,7 @@ msgstr "åå(_X)"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Connection _name:"
-msgstr "èæåç(_I)"
+msgstr "èæåç(_N)ï"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Connect _automatically"
@@ -1937,7 +1978,7 @@ msgstr "èåèæ(_A)"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:11
 msgid "A_vailable to all users"
-msgstr "åææçæåç"
+msgstr "åææçæåç(_V)"
 
 #: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
@@ -1990,7 +2031,7 @@ msgstr "äåèæåé"
 #: ../src/connection-editor/nm-connection-list.c:516
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "åæ '%s' / '%s' éæ: %d"
+msgstr "åæâ%sâ/â%sâéæï%d"
 
 #: ../src/connection-editor/nm-connection-list.c:523
 #: ../src/connection-editor/nm-connection-list.c:662
@@ -2044,7 +2085,7 @@ msgid ""
 msgstr ""
 "VPN æäæææçåå VPN èæã\n"
 "\n"
-"éè: ææ VPN æåçåã"
+"éèïææ VPN æåçåã"
 
 #: ../src/connection-editor/nm-connection-list.c:944
 msgid "Could not edit imported connection"
@@ -2060,7 +2101,7 @@ msgstr "æåäçç"
 
 #: ../src/connection-editor/nm-connection-list.c:1263
 msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "æåç VPN æäïèèååèäääåçææéã"
+msgstr "æåç VPN æäãèèååèäääåçææéã"
 
 #: ../src/connection-editor/nm-connection-list.c:1274
 msgid "_Edit"
@@ -2101,22 +2142,22 @@ msgstr "ååèæåé"
 #: ../src/connection-editor/nm-connection-list.c:1575
 #, c-format
 msgid "Don't know how to create '%s' connections"
-msgstr "ææåååäâ%sâçèæ"
+msgstr "äçéåäååâ%sâèæ"
 
 #: ../src/connection-editor/nm-connection-list.c:1630
 #: ../src/connection-editor/nm-connection-list.c:1642
 msgid "Error editing connection"
-msgstr "äåèæåé"
+msgstr "çèèæåé"
 
 #: ../src/connection-editor/nm-connection-list.c:1631
 #, c-format
 msgid "Don't know how to edit '%s' connections"
-msgstr "ææçèåäâ%sâçèæ"
+msgstr "äçéåäçèâ%sâèæ"
 
 #: ../src/connection-editor/nm-connection-list.c:1643
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
-msgstr "æææååäâ%sâçèæ"
+msgstr "æææåâ%sâèæ"
 
 #: ../src/connection-editor/vpn-helpers.c:230
 #, c-format
@@ -2146,7 +2187,7 @@ msgstr "ææ(_R)"
 #: ../src/connection-editor/vpn-helpers.c:318
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr "æåèå %s ææäææåäåç VPN èæ?"
+msgstr "æåèå %s ææäææåäåç VPN èæï"
 
 #: ../src/connection-editor/vpn-helpers.c:354
 msgid "Cannot export VPN connection"
@@ -2159,118 +2200,115 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"VPN èæâ%sâææèååè %sã\n"
+"VPN èæâ%sâææååè %sã\n"
 "\n"
-"éè: %sã"
+"éèï%sã"
 
 #: ../src/connection-editor/vpn-helpers.c:391
 msgid "Export VPN connection..."
-msgstr "åå VPN èæ"
+msgstr "åå VPN èæ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
+#: ../src/gnome-bluetooth/bt-widget.c:321
 #, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "ææåç PAN èæï%s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "æççèåçåääçï"
+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) %s)."
+msgstr "èçéçäåç(ææ NetworkManager åéï(%s) %s)ã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../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/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "éèï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, 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:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "æççèåçåääçï"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "çåèæåååèåæ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 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:567
+msgid "unknown modem type."
+msgstr "æçèåèèåçåã"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "èæåçèåèã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "æåæåäçèçèæã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "ææçèèçäææèæã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "æåææçèéç..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "æææåèçèåã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "åèçæåççèæååéåçéèèçééåã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1012
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "èçéçäåç(èæå D-Bus åèï%s)ã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-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:1031
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "èçéçäåç(ææ NetworkManager åéï%s)ã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "äçæççåçèääççèå(PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "äçæçææèéäèç(DUN)"
+msgid "%s Network"
+msgstr "%s çç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:205
 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:212
 msgid "Your Device:"
 msgstr "æçèåï"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:223
 msgid "Your Provider:"
 msgstr "æçæååï"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:234
 msgid "Your Plan:"
-msgstr "æçèåï"
+msgstr "æçåéï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../src/libnm-gtk/nm-mobile-wizard.c:259
 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 "
@@ -2278,132 +2316,132 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"çåæçææéæçèååçääåæççåååæäåçèæãåæèæåèæææ"
-"èéççèæïèæææçèåãèäææççåååèåïåçç >> éééèåä"
+"çåæçææéæçèçåçääåæççåååæäåçèæãåæèæåèæææ"
+"èéççèæïèæææçèçãèäææççåååèçïåçç >> éééèåä"
 "éæâççèæâã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnm-gtk/nm-mobile-wizard.c:271
 msgid "Confirm Mobile Broadband Settings"
-msgstr "çèçåååèå"
+msgstr "çèçåååèç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:332
 msgid "Unlisted"
 msgstr "æåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:487
 msgid "_Select your plan:"
-msgstr "éææçèå(_S)ï"
+msgstr "éææçåé(_S)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../src/libnm-gtk/nm-mobile-wizard.c:511
 msgid "Selected plan _APN (Access Point Name):"
-msgstr "éäçèå _APN (èéçåç)ï"
+msgstr "æéåéç _APN (èéçåç)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:528
+#: ../src/libnm-gtk/nm-mobile-wizard.c:535
 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"
+"èåïéæäääæççåéåèåèååèæèçééæææèæã\n"
 "\n"
-"åææäçåæçèåïèèéæçæäåäèåèåç APNã"
+"åææäçåæçåéïèèéæçæäåäèååéç APNã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:542
 msgid "Choose your Billing Plan"
-msgstr "éææçäèèå"
+msgstr "éææçäèåé"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:590
 msgid "My plan is not listed..."
-msgstr "æçèåææèåå..."
+msgstr "æçåéæèåå..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnm-gtk/nm-mobile-wizard.c:747
 msgid "Select your provider from a _list:"
-msgstr "äääåèäéææçæäå(_L)ï"
+msgstr "äåèäéææçæäå(_L)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:760
 msgid "Provider"
 msgstr "æäå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:785
 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:796
 msgid "Provider:"
 msgstr "æäåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../src/libnm-gtk/nm-mobile-wizard.c:820
 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:826
 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:837
 msgid "Choose your Provider"
 msgstr "éææçæäå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
 msgid "Country or Region List:"
 msgstr "ååæåååèï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or region"
 msgstr "ååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
 msgid "My country is not listed"
 msgstr "ææååå/ååææèåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
 msgid "Choose your Provider's Country or Region"
 msgstr "éææçæäåçååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
 msgid "Installed GSM device"
 msgstr "ååèç GSM èå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
 msgid "Installed CDMA device"
 msgstr "ååèç CDMA èå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "æåæçååååæçååèçääåèç(3G)ççççåååèæã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
 msgid "You will need the following information:"
 msgstr "æåéèäääæï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid "Your broadband provider's name"
 msgstr "æçååæäååç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
 msgid "Your broadband billing plan name"
-msgstr "æçååäèèååç"
+msgstr "æçååäèåéåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(åæäæåä)æçååäèèå APN (èéçåç)"
+msgstr "(åæäæåä)æçååäèåé APN (èéçåç)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "äæçåååèåååääèæ(_T)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1456
 msgid "Any device"
 msgstr "ääèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
 msgid "Set up a Mobile Broadband Connection"
 msgstr "èçääçåååèæ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
 msgid "New Mobile Broadband Connection"
 msgstr "æçåååèæ"
 
@@ -2418,8 +2456,8 @@ msgstr "åç(_R)"
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1160
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "éèåçæåéæèéæçççâ%sâã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1162
@@ -2440,7 +2478,7 @@ msgstr "ææççç"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1172
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "èäæåæåççæçççèåääåçã"
+msgstr "èåæèååçæççççåçã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1174
 msgid "Connect to Hidden Wireless Network"
@@ -2454,15 +2492,15 @@ msgstr "éèçæççç"
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
-msgstr "èåææèæåçéèæççççåçåååæèçäæã"
+msgstr "èåæèèæçéèæççççåçåååæèçäæã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wireless _security:"
-msgstr "æçççååæ(_W)ï"
+msgstr "æçççååæ(_S)ï"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
-msgstr "èæ(_N)ï"
+msgstr "èæ(_O)ï"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wireless _adapter:"
@@ -2529,7 +2567,7 @@ msgstr "ææå"
 #: ../src/mb-menu-item.c:133
 #, c-format
 msgid "Home network (%s)"
-msgstr "äçç (%s)"
+msgstr "äçç(%s)"
 
 #: ../src/mb-menu-item.c:135
 #, c-format
@@ -2547,17 +2585,17 @@ msgstr "æåèæç"
 #: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, c-format
 msgid "%s (%s roaming)"
-msgstr "%s (%s ææä)"
+msgstr "%s(%s ææä)"
 
 #: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
-msgstr "%s (ææä)"
+msgstr "%s(ææä)"
 
 #: ../src/mb-menu-item.c:162
 #, c-format
 msgid "Roaming network (%s)"
-msgstr "ææçç (%s)"
+msgstr "ææçç(%s)"
 
 #: ../src/mb-menu-item.c:164
 #, c-format
@@ -2568,17 +2606,23 @@ msgstr "ææçç"
 msgid "Default"
 msgstr "éè"
 
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:325
+#, c-format
+msgid "%s connection"
+msgstr "%s èæ"
+
 #: ../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/wireless-security/eap-method.c:279
+#: ../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 "
@@ -2587,17 +2631,17 @@ 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)"
+msgstr "DER æ PEM èä(*.der, *.pem, *.crt, *.cer)"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
@@ -2642,7 +2686,7 @@ msgstr "éæää PAC æä..."
 
 #: ../src/wireless-security/eap-method-fast.c:406
 msgid "PAC files (*.pac)"
-msgstr "PAC æä (*.pac)"
+msgstr "PAC æä(*.pac)"
 
 #: ../src/wireless-security/eap-method-fast.c:410
 msgid "All files"
@@ -2679,7 +2723,7 @@ msgstr "PEAP çæ(_V)ï"
 
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 msgid "As_k for this password every time"
-msgstr "ææèéæåç(_K)"
+msgstr "ææèéèåç(_K)"
 
 #: ../src/wireless-security/eap-method-tls.c:246
 msgid "Unencrypted private keys are insecure"
@@ -2792,6 +2836,12 @@ msgstr "æçåé(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP çå(_X)ï"
 
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "æææåèçèåã"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "èçéçäåç(åå D-Bus äçæåååè)ã"
+
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "ååæåæèæåæççç"