[network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 8751236c80c1313855f5f387d7557b95ec4d97ab
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Jul 18 10:00:44 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1250 ++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 1287 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 1349 insertions(+), 1188 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c21f168..13a3860 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 08:20+0800\n"
-"PO-Revision-Date: 2012-03-25 08:26+0800\n"
+"POT-Creation-Date: 2012-07-18 10:00+0800\n"
+"PO-Revision-Date: 2012-07-18 10:00+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -22,86 +22,108 @@ msgstr ""
 "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."
+msgstr "åéèçãTUREãïäåçççéçæçéçã"
+
+#: ../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ãïäåçççéçæçéçã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "åéèçãTUREãïäåçççéçæçéçã"
 
-#: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
+#: ../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 connecting to or "
+"disconnecting from a VPN."
 msgstr "åéèçãTRUEãïäåçççéçæçéçã"
 
-#: ../nm-applet.schemas.in.h:6
-msgid "Set this to TRUE to disable notifications when wireless networks are available."
-msgstr "åéèçãTRUEãïäåçæççççåçæçéçã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "åæåççççéç"
 
-#: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "åéèçãTRUEãïäåçäçéæçååç adhoc ççã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when wireless networks are "
+"available."
+msgstr "åéèçãTUREãïäåçæççççåçã"
 
-#: ../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 "çäæåèåæäæèèçåæçæäã"
 
-#: ../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."
+msgstr "åéèçãTUREãïäåçäçéæçååç adhoc ççã"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Ignore CA certificate"
+msgstr "åç CA èæ"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "åéèçãTUREãïåçå 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 "åéèçãTUREãïåçåçä EAP èèä 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:399
+#: ../src/applet-device-gsm.c:446 ../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:441
+#: ../src/applet-device-gsm.c:488 ../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:445
+#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "ååçéç"
 
@@ -109,63 +131,51 @@ 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:481
+#: ../src/applet-device-gsm.c:528 ../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:484
+#: ../src/applet-device-gsm.c:531 ../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:487
+#: ../src/applet-device-gsm.c:534 ../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:2503
+#: ../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: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-bt.c:244 ../src/applet-device-cdma.c:508
 #: ../src/applet-device-gsm.c:555
 #, 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:184 ../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:345 ../src/applet-device-gsm.c:392
 #: ../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:347 ../src/applet-device-gsm.c:394
 #: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #: ../src/connection-editor/nm-connection-list.c:1510
 msgid "Mobile Broadband"
 msgstr "æååé"
@@ -179,36 +189,30 @@ msgstr "æçæååé (CDMA) éçâ"
 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:503 ../src/applet-device-gsm.c:550
 #: ../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:506 ../src/applet-device-gsm.c:553
 #: ../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:647 ../src/applet-device-cdma.c:653
 msgid "CDMA network."
 msgstr "CDMA ççã"
 
-#: ../src/applet-device-cdma.c:648
-#: ../src/applet-device-gsm.c:1198
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
 msgid "You are now registered on the home network."
 msgstr "äçååèåèåçççã"
 
-#: ../src/applet-device-cdma.c:654
-#: ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
 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:213 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
@@ -259,7 +263,9 @@ msgstr "éèèé SIM PIN ç"
 #. FIXME: some warning about # of times you can enter incorrect PIN
 #: ../src/applet-device-gsm.c:991
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
+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
@@ -283,7 +289,9 @@ msgstr "éèèé SIM PUK ç"
 #. FIXME: some warning about # of times you can enter incorrect PUK
 #: ../src/applet-device-gsm.c:1003
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
 
 #. Translators: PUK code entry label
@@ -306,8 +314,7 @@ msgstr "éæèå PIN çï"
 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:1197 ../src/applet-device-gsm.c:1203
 msgid "GSM network."
 msgstr "GSM ççã"
 
@@ -334,8 +341,7 @@ msgid "Wired Network"
 msgstr "æççç"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232
-#: ../src/applet.c:1509
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
 msgid "disconnected"
 msgstr "åæç"
 
@@ -376,113 +382,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:925
+#: ../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
-#| msgid "Failed to create PAN connection: %s"
+#: ../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:491
-#: ../src/applet.c:535
-#: ../src/applet.c:561
-#| msgid "Unknown"
+#: ../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:494
-#: ../src/applet.c:564
-#| msgid "Connection add failed"
+#: ../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
-#| msgid "Could not edit new connection"
+#: ../src/applet-device-wifi.c:1396
 msgid "Failed to add new connection"
 msgstr "çæååæéç"
 
@@ -522,8 +518,7 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "åæ WEP"
 
-#: ../src/applet-dialogs.c:113
-#: ../src/applet-dialogs.c:245
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
 #: ../src/applet-dialogs.c:247
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
@@ -532,8 +527,7 @@ msgstr "WPA/WPA2"
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
 #: ../src/connection-editor/page-wireless-security.c:265
 #: ../src/libnm-gtk/nm-wireless-dialog.c:905
 msgctxt "Wifi/wired security"
@@ -545,14 +539,12 @@ msgstr "ææ"
 msgid "%s (default)"
 msgstr "%s (éèå)"
 
-#: ../src/applet-dialogs.c:346
-#: ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "äæ"
@@ -598,8 +590,7 @@ msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432
-#: ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
 msgid "General"
 msgstr "äè"
 
@@ -638,13 +629,11 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553
-#: ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
 msgid "IP Address:"
 msgstr "IP äåï"
 
-#: ../src/applet-dialogs.c:555
-#: ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
 msgctxt "Address"
 msgid "Unknown"
 msgstr "äæ"
@@ -663,8 +652,7 @@ msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:588
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
 msgid "Default Route:"
 msgstr "éèèçï"
 
@@ -729,7 +717,8 @@ msgstr ""
 "èèååäççèçèèçèè"
 
 #: ../src/applet-dialogs.c:942
-msgid "Notification area applet for managing your network devices and connections."
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "çäççäçççèçèéççéçåéæçåã"
 
 #: ../src/applet-dialogs.c:944
@@ -753,36 +742,33 @@ msgstr "éçèã%sãéèåçã"
 msgid "Password:"
 msgstr "åçï"
 
-#: ../src/applet.c:489
-#| msgid "Failed to create PAN connection: %s"
+#: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "çæåå/äçéç"
 
-#: ../src/applet.c:533
-#| msgid "disconnected"
+#: ../src/applet.c:532
 msgid "Device disconnect failed"
 msgstr "èçæçåæ"
 
-#: ../src/applet.c:538
-#| msgid "Disconnected"
+#: ../src/applet.c:537
 msgid "Disconnect failure"
 msgstr "æçåæ"
 
-#: ../src/applet.c:559
-#| msgid "Connection add failed"
+#: ../src/applet.c:558
 msgid "Connection activation failed"
 msgstr "éççæåæ"
 
-#: ../src/applet.c:1014
+#: ../src/applet.c:1013
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåçççéçèäæäã"
 
-#: ../src/applet.c:1017
+#: ../src/applet.c:1016
 #, c-format
 msgid ""
 "\n"
@@ -791,16 +777,17 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåæåçåæäã"
 
-#: ../src/applet.c:1020
+#: ../src/applet.c:1019
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåååçæççæã"
 
-#: ../src/applet.c:1023
+#: ../src/applet.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -809,7 +796,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåçéççåèåéæã"
 
-#: ../src/applet.c:1026
+#: ../src/applet.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -818,7 +805,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåææåæååã"
 
-#: ../src/applet.c:1029
+#: ../src/applet.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -827,7 +814,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æååååæã"
 
-#: ../src/applet.c:1032
+#: ../src/applet.c:1031
 #, c-format
 msgid ""
 "\n"
@@ -836,7 +823,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåçææææç VPN æåã"
 
-#: ../src/applet.c:1035
+#: ../src/applet.c:1034
 #, c-format
 msgid ""
 "\n"
@@ -845,7 +832,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåççæç VPN æåã"
 
-#: ../src/applet.c:1042
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -854,16 +841,17 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæã"
 
-#: ../src/applet.c:1060
+#: ../src/applet.c:1059
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåçççéçäæäã"
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -872,7 +860,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåååæã"
 
-#: ../src/applet.c:1069
+#: ../src/applet.c:1068
 #, c-format
 msgid ""
 "\n"
@@ -881,17 +869,29 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæçã"
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:1098
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN éçåæåçã\n"
+"%s\n"
+
+#: ../src/applet.c:1100
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN éçåæåçã\n"
+
+#: ../src/applet.c:1102
 msgid "VPN Login Message"
 msgstr "VPN çéèæ"
 
-#: ../src/applet.c:1109
-#: ../src/applet.c:1117
-#: ../src/applet.c:1167
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
 msgid "VPN Connection Failed"
 msgstr "VPN éçåæ"
 
-#: ../src/applet.c:1174
+#: ../src/applet.c:1173
 #, c-format
 msgid ""
 "\n"
@@ -904,7 +904,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1177
+#: ../src/applet.c:1176
 #, c-format
 msgid ""
 "\n"
@@ -917,140 +917,139 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1496
 msgid "device not ready (firmware missing)"
 msgstr "èçåæåç (çåéé)"
 
-#: ../src/applet.c:1499
+#: ../src/applet.c:1498
 msgid "device not ready"
 msgstr "èçåæåç"
 
-#: ../src/applet.c:1525
+#: ../src/applet.c:1524
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/applet.c:1539
+#: ../src/applet.c:1538
 msgid "device not managed"
 msgstr "èççæçç"
 
-#: ../src/applet.c:1583
+#: ../src/applet.c:1582
 msgid "No network devices available"
 msgstr "ææåççççèç"
 
-#: ../src/applet.c:1671
+#: ../src/applet.c:1670
 msgid "_VPN Connections"
 msgstr "_VPN éç"
 
-#: ../src/applet.c:1728
+#: ../src/applet.c:1727
 msgid "_Configure VPN..."
 msgstr "èç VPN(_C)â"
 
-#: ../src/applet.c:1732
+#: ../src/applet.c:1731
 msgid "_Disconnect VPN"
 msgstr "è VPN æç(_D)"
 
-#: ../src/applet.c:1830
+#: ../src/applet.c:1825
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ææåèâ."
 
-#: ../src/applet.c:1835
-#: ../src/applet.c:2634
+#: ../src/applet.c:1830 ../src/applet.c:2631
 msgid "Networking disabled"
 msgstr "ççååç"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2056
+#: ../src/applet.c:2051
 msgid "Enable _Networking"
 msgstr "åççç(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2065
+#: ../src/applet.c:2060
 msgid "Enable _Wireless"
 msgstr "åççççç(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2074
+#: ../src/applet.c:2069
 msgid "Enable _Mobile Broadband"
 msgstr "åçæååé(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2083
+#: ../src/applet.c:2078
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "åç WiMA_X æååé"
 
 #. Toggle notifications item
-#: ../src/applet.c:2094
+#: ../src/applet.c:2089
 msgid "Enable N_otifications"
 msgstr "åçéçåè(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2105
+#: ../src/applet.c:2100
 msgid "Connection _Information"
 msgstr "éçèè(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2115
+#: ../src/applet.c:2110
 msgid "Edit Connections..."
 msgstr "çèéçâ"
 
 #. Help item
-#: ../src/applet.c:2129
+#: ../src/applet.c:2124
 msgid "_Help"
 msgstr "æå(_H)"
 
 #. About item
-#: ../src/applet.c:2138
+#: ../src/applet.c:2133
 msgid "_About"
 msgstr "éæ(_A)"
 
-#: ../src/applet.c:2315
+#: ../src/applet.c:2310
 msgid "Disconnected"
 msgstr "åæç"
 
-#: ../src/applet.c:2316
+#: ../src/applet.c:2311
 msgid "The network connection has been disconnected."
 msgstr "ççéçåäæã"
 
-#: ../src/applet.c:2497
+#: ../src/applet.c:2494
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "æåæåççéçã%sãâ"
 
-#: ../src/applet.c:2500
+#: ../src/applet.c:2497
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ççéçã%sãéèäçèéèâ"
 
-#: ../src/applet.c:2506
+#: ../src/applet.c:2503
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ççéçã%sãåäçä"
 
-#: ../src/applet.c:2589
+#: ../src/applet.c:2586
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "æååå VPN éçã%sãâ"
 
-#: ../src/applet.c:2592
+#: ../src/applet.c:2589
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN éçã%sãéèäçèéèâ"
 
-#: ../src/applet.c:2595
+#: ../src/applet.c:2592
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "æåèæ VPN æäã%sãçççäåâ"
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2595
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN éçã%sãåäçä"
 
-#: ../src/applet.c:2639
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "ææççéæ"
 
-#: ../src/applet.c:3394
+#: ../src/applet.c:3327
 msgid "NetworkManager Applet"
 msgstr "NetworkManager éæçå"
 
@@ -1063,20 +1062,18 @@ msgid "_Unlock"
 msgstr "èé(_U)"
 
 #: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "åçççéç"
-
-#: ../src/info.ui.h:2
 msgid "Connection Information"
 msgstr "éçèè"
 
-#: ../src/wired-8021x.ui.h:1
-#: ../src/wired-dialog.c:104
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "åçççéç"
+
+#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
 msgid "Wired 802.1X authentication"
 msgstr "æççç 802.1X éè"
 
-#: ../src/wired-8021x.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ççåç(_N)ï"
 
@@ -1090,385 +1087,409 @@ 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-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 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."
-msgstr "åæåçïéåéçåæéäæåçéèççéçã"
+msgid "Ig_nore automatically obtained routes"
+msgstr "åçèåçåçèç(_N)"
 
 #: ../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 "åçèåçåçèç(_N)"
+msgid "_Use this connection only for resources on its network"
+msgstr "ååäçéåéççççèææïæäçæéç(_U)"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "_Use this connection only for resources on its network"
-msgstr "ååäçéåéççççèææïæäçæéç(_U)"
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "åæåçïéåéçåæéäæåçéèççéçã"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 #: ../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-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-msgid "Addresses"
-msgstr "åå"
-
-#: ../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-wired.ui.h:1
+#: ../src/connection-editor/ce-page-wireless.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
+#: ../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:4
-msgid "D_HCP client ID:"
-msgstr "D_HCP çæç ID:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "ææéç"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "çäèæäæåçççåãèäçéèééäåççåã"
+#: ../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:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
 #: ../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."
-msgstr "çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåçäåã"
+msgid "_Method:"
+msgstr "ææ(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "ææéç"
+msgid "Addresses"
+msgstr "åå"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
-msgid "Manual"
-msgstr "æå"
+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 çæçèåïèåæèåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "éè IPv_4 addressing æååææéç"
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr "çäèæäæåçççåãèäçéèééäåççåã"
 
 #: ../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 "S_earch domains:"
 msgstr "æåçå(_E):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../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:13
-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 çæçèåïèåæèåã"
+#: ../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 äæå:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-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-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 "çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåçäåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_DNS servers:"
-msgstr "_DNS äæå:"
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "éè IPv_4 addressing æååææéç"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Method:"
-msgstr "ææ(_M):"
+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 "_Routesâ"
 msgstr "èç(_R)â"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "éè IPv_6 addressing æååææéç"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds."
+#: ../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 éçåæåçèïèåèéçåæã"
 
 #: ../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 "åæåççççæäçïåèäçæé(_R)"
+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 "åæ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "ææâ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "N_etwork ID:"
-msgstr "çç ID(_E):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "æå(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "P_IN:"
-msgstr "P_IN:"
+msgid "Advanced"
+msgstr "éé"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "åå 2G (GPRS/EDGE)"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "åå 3G (UMTS/HSPA)"
+msgid "N_etwork ID:"
+msgstr "çç ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "Sho_w passwords"
-msgstr "éçåç(_W)"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "éå(_T)ï"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
+msgid "Change..."
+msgstr "ææâ"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+msgid "P_IN:"
+msgstr "P_IN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "éå(_T)ï"
+msgid "Allow _roaming if home network is not available"
+msgstr "åæåççççæäçïåèäçæé(_R)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+msgid "Sho_w passwords"
+msgstr "éçåç(_W)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "åè _BSD èæåç"
+msgid "Authentication"
+msgstr "éè"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "åè _Deflate èæåç"
-
-#: ../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 èæåç"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "äç TCP æéåç(_H)"
+msgid "Allow _Deflate data compression"
+msgstr "åè _Deflate èæåç"
 
 #: ../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)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "åé PPP åéåå(_E)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+msgid "Twisted Pair (TP)"
+msgstr "éçç (TP)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+msgid "Attachment Unit Interface (AUI)"
+msgstr "éååääé (AUI)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+msgid "BNC"
+msgstr "BNC"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "éååääé (AUI)"
+msgid "Media Independent Interface (MII)"
+msgstr "åéççäé (MII)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "èååè(_O)"
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:9
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "C_loned MAC address:"
-msgstr "èèç MAC äå(_L):"
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "Full duple_x"
-msgstr "åéå(_X)"
+msgid "_Port:"
+msgstr "éæå(_P)ï"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "åéççäé (MII)"
+msgid "_Speed:"
+msgstr "éå(_S)ï"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-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"
-msgstr "åéèèåç MAC äåææçéåéçäççççèçççääåãéååèäçç MAC èèæåèãäåï00:11:22:33:44:55"
+msgid "Full duple_x"
+msgstr "åéå(_X)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "éçç (TP)"
+msgid "Aut_onegotiate"
+msgstr "èååè(_O)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "_Device MAC address:"
 msgstr "èçç MAC äå(_D):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "èèç MAC äå(_L):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "éæå(_P)ï"
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
+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"
+msgstr "åéèèåç MAC äåææçéåéçäççççèçççääåãéååèäçç MAC èèæåèãäåï00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "éå(_S)ï"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "_MTU:"
+msgstr "_MTU:"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "bytes"
 msgstr "äåç"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wireless.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-wireless.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:8
+#: ../src/connection-editor/ce-page-wireless.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-wireless.ui.h:5
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "SS_ID:"
-msgstr "SS_ID:"
+msgid "mW"
+msgstr "mW"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
+msgid "Transmission po_wer:"
+msgstr "åèèè(_W):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:13
-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"
+msgid "Mb/s"
+msgstr "Mb/s"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
-msgstr "åèèè(_W):"
+msgid "_Rate:"
+msgstr "éç(_R):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:15
+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-wireless.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
+msgid "C_hannel:"
+msgstr "éé(_H)ï"
+
 #: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
-msgstr "éç(_R):"
+msgid "Ban_d:"
+msgstr "éå(_D):"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
+msgid "M_ode:"
+msgstr "æå(_O)ï"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+msgid "SS_ID:"
+msgstr "SS_ID:"
 
 #: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "S_ecurity:"
@@ -1479,51 +1500,52 @@ 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"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge Handshake éèéèåå"
-
-#: ../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"
+
 #: ../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 "Microsoft Challenge Handshake éèéèåå"
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake éèéèåå"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake éèéèååç 2 ç"
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "åçéèéèåå"
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake éèéèåå"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake éèéèååç 2 ç"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+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/connection-editor/ce-vpn-wizard.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
@@ -1537,29 +1559,32 @@ msgid "Choose a VPN Connection Type"
 msgstr "èéæ VPN çéçéå"
 
 #: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Createâ"
-msgstr "åçâ"
+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/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."
-msgstr "éæäæèçåæéçäç VPN éåãåæäæèåçç VPN éçéåææåçåæåäïåèæææåèæçç VPN åæçåã"
+msgid "Createâ"
+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 "éèé"
 
@@ -1569,12 +1594,12 @@ 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 "åç"
 
 #: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 #: ../src/connection-editor/nm-connection-list.c:1518
 msgid "DSL"
 msgstr "DSL"
@@ -1583,7 +1608,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"
@@ -1635,16 +1660,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 "éåçæåçåï domains:"
+
+#: ../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 äçèäéã"
 
@@ -1653,7 +1688,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 "åç"
 
@@ -1661,16 +1696,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 äçèäéã"
 
@@ -1688,7 +1723,9 @@ msgid "Select Mobile Broadband Provider Type"
 msgstr "éææååéäæåéå"
 
 #: ../src/connection-editor/page-mobile.c:674
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
 msgstr "èéæäçççåéäæåæäççæèãåæääçåïèæèäæåã"
 
 #: ../src/connection-editor/page-mobile.c:679
@@ -1744,7 +1781,7 @@ 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-editor.ui.h:7
 #: ../src/connection-editor/nm-connection-list.c:1514
 msgid "VPN"
 msgstr "VPN"
@@ -1766,11 +1803,13 @@ msgstr "VPN éç %d"
 
 #: ../src/connection-editor/page-wired.c:89
 #: ../src/connection-editor/page-wireless.c:94
-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"
+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:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #: ../src/connection-editor/nm-connection-list.c:1502
 msgid "Wired"
 msgstr "æç"
@@ -1809,7 +1848,7 @@ msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
 #: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 #: ../src/connection-editor/nm-connection-list.c:1506
 msgid "Wireless"
 msgstr "çççç"
@@ -1860,58 +1899,60 @@ 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
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
+#: ../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 "éèäååéåéççæéèäçææäçèã"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "ææäçèçåç"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Import"
+msgstr "åå(_I)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "èåéç(_A)"
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+msgid "E_xport"
+msgstr "åå(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 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:10
+msgid "Connect _automatically"
+msgstr "èåéç(_A)"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "åå(_I)"
+msgid "A_vailable to all users"
+msgstr "ææäçèçåç"
 
 #: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
@@ -1979,7 +2020,9 @@ msgstr "åååçèåæççéè"
 #: ../src/connection-editor/nm-connection-list.c:546
 #: ../src/connection-editor/nm-connection-list.c:719
 #: ../src/connection-editor/nm-connection-list.c:885
-msgid "The connection editor dialog could not be initialized due to an unknown error."
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr "çæäæçéèäéççèååèççæåååã"
 
 #: ../src/connection-editor/nm-connection-list.c:557
@@ -2093,7 +2136,8 @@ msgstr "æäå UUIDã%sãçéç"
 #: ../src/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN connection information\n"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -2193,7 +2237,9 @@ msgid "could not find the Bluetooth device."
 msgstr "æäåèçèçã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:980
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
+msgid ""
+"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+"Networking connection."
 msgstr "éèçèçéæååéåèåæèççéçååçã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1012
@@ -2207,7 +2253,8 @@ msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1031
 #, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1098
@@ -2218,48 +2265,55 @@ msgstr "äçææäçççèçïPAN/NAPï"
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "äçææååäèçïDUNï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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 "äçèå:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
-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."
+#: ../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 "
+"resources, double-check your settings.  To modify your mobile broadband "
+"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 "çèæååéèå"
 
-#: ../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)ï"
 
-#: ../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ïAccess Point Nameïååéåçïï"
 
-#: ../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"
+"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 ""
@@ -2267,99 +2321,101 @@ msgstr ""
 "\n"
 "åæääçåæäççèåïèæèäæåïäåçèåç APN çäã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:542
 msgid "Choose your Billing Plan"
 msgstr "éæäçèèèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:590
 msgid "My plan is not listed..."
 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):"
 
-#: ../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
-msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
+#: ../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 "åéèèèåçåç"
 
-#: ../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ïååéåçï"
 
-#: ../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 "æçæååééç"
 
@@ -2373,7 +2429,9 @@ 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'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "éèåçææåååçåäååççççã%sãã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1162
@@ -2405,31 +2463,37 @@ msgid "Hidden wireless network"
 msgstr "éèççççç"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-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."
 msgstr "èåäèéæçéèçççççåçèååæèçèæã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wireless _security:"
+msgstr "ççççåå(_W):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "éç(_N):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wireless _adapter:"
 msgstr "ççççå(_A)ï"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "ççççåå(_W):"
-
 #: ../src/main.c:73
 msgid "Usage:"
 msgstr "çæ:"
 
 #: ../src/main.c:75
-msgid "This program is a component of NetworkManager (http://projects.gnome.org/NetworkManager)."
+msgid ""
+"This program is a component of 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."
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
 msgstr "çäå GNOME æéçåäéèïèäæäçåäåã"
 
 #: ../src/mb-menu-item.c:57
@@ -2490,14 +2554,12 @@ msgstr "æåä"
 msgid "registration denied"
 msgstr "èåèæ"
 
-#: ../src/mb-menu-item.c:151
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, 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:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%sïæéï"
@@ -2516,63 +2578,67 @@ msgstr "æéçç"
 msgid "Default"
 msgstr "éè"
 
-#: ../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)."
+#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
 
-#: ../src/wireless-security/eap-method.c:279
+#: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "æéæääèæææåä(CA)èæ"
 
-#: ../src/wireless-security/eap-method.c:280
-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?"
+#: ../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?"
 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-fast.ui.h:2
-msgid "Allow automatic PAC pro_visioning"
-msgstr "åèèåäæ PAC (_V)"
-
-#: ../src/wireless-security/eap-method-fast.ui.h:3
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "Anony_mous identity:"
-msgstr "ååèå(_M)ï"
-
-#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Anonymous"
 msgstr "åå"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "åéè"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "åè"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../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-fast.ui.h:6
 msgid "PAC _file:"
 msgstr "PAC ææ(_F):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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 "_Inner authentication:"
 msgstr "åééè(_I):"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "åèèåäæ PAC (_V)"
+
 #: ../src/wireless-security/eap-method-fast.c:261
 #: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
@@ -2601,25 +2667,25 @@ msgstr "MD5"
 msgid "Choose a Certificate Authority certificate..."
 msgstr "éæèæææåä(CA)èæâ"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "çæ 0"
+
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+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 "CA èæ(_A)ï"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
 msgstr "PEAP çæ(_V):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "Version 0"
-msgstr "çæ 0"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-msgid "Version 1"
-msgstr "çæ 1"
-
-#: ../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)"
 
@@ -2629,7 +2695,9 @@ msgstr "æååççååçåæäååç"
 
 #: ../src/wireless-security/eap-method-tls.c:249
 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"
+"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 ""
@@ -2645,11 +2713,15 @@ msgstr "éæäçåäèæâ"
 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 "èå(_D)ï"
 
-#: ../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)ï"
 
@@ -2657,10 +2729,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)"
@@ -2690,46 +2758,46 @@ msgid "Protected EAP (PEAP)"
 msgstr "äèå EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
 msgstr "éè(_E):"
 
 #: ../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:6
-msgid "Open System"
-msgstr "éæçç"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "Shared Key"
-msgstr "åäåçå"
+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:9
+#: ../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 "_Security:"
 #~ msgstr "ååæ(_S)ï"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 160c391..935446c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 08:20+0800\n"
-"PO-Revision-Date: 2012-03-25 08:26+0800\n"
+"POT-Creation-Date: 2012-07-18 10:00+0800\n"
+"PO-Revision-Date: 2012-07-17 22:56+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -22,86 +22,108 @@ msgstr ""
 "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."
+msgstr "åéèçãTUREãïäåççèéçæçéçã"
+
+#: ../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ãïäåççèéçæçéçã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "åéèçãTUREãïäåççèéçæçéçã"
 
-#: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
+#: ../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 connecting to or "
+"disconnecting from a VPN."
 msgstr "åéèçãTRUEãïäåççèéçæçéçã"
 
-#: ../nm-applet.schemas.in.h:6
-msgid "Set this to TRUE to disable notifications when wireless networks are available."
-msgstr "åéèçãTRUEãïäåçæçççèåçæçéçã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "åæåççèçéç"
 
-#: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "åéèçãTRUEãïäåçäçéæçååç adhoc çèã"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when wireless networks are "
+"available."
+msgstr "åéèçãTUREãïäåçæçççèåçã"
 
-#: ../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 "çäæåèåæäæèèçåæçæäã"
 
-#: ../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."
+msgstr "åéèçãTUREãïäåçäçéæçååç adhoc çèã"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Ignore CA certificate"
+msgstr "åç CA æè"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "åéèçãTUREãïåçå 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 "åéèçãTUREãïåçåçä EAP èèä 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:399
+#: ../src/applet-device-gsm.c:446 ../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:441
+#: ../src/applet-device-gsm.c:488 ../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:445
+#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "ååçéç"
 
@@ -109,63 +131,51 @@ 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:481
+#: ../src/applet-device-gsm.c:528 ../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:484
+#: ../src/applet-device-gsm.c:531 ../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:487
+#: ../src/applet-device-gsm.c:534 ../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:2503
+#: ../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: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-bt.c:244 ../src/applet-device-cdma.c:508
 #: ../src/applet-device-gsm.c:555
 #, 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:184 ../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:345 ../src/applet-device-gsm.c:392
 #: ../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:347 ../src/applet-device-gsm.c:394
 #: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #: ../src/connection-editor/nm-connection-list.c:1510
 msgid "Mobile Broadband"
 msgstr "èååé"
@@ -179,36 +189,30 @@ msgstr "æçèååé (CDMA) éçâ"
 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:503 ../src/applet-device-gsm.c:550
 #: ../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:506 ../src/applet-device-gsm.c:553
 #: ../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:647 ../src/applet-device-cdma.c:653
 msgid "CDMA network."
 msgstr "CDMA çèã"
 
-#: ../src/applet-device-cdma.c:648
-#: ../src/applet-device-gsm.c:1198
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
 msgid "You are now registered on the home network."
 msgstr "æçååèåèåççèã"
 
-#: ../src/applet-device-cdma.c:654
-#: ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
 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:213 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
@@ -259,7 +263,9 @@ msgstr "éèèé SIM PIN ç"
 #. FIXME: some warning about # of times you can enter incorrect PIN
 #: ../src/applet-device-gsm.c:991
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
+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
@@ -283,7 +289,9 @@ msgstr "éèèé SIM PUK ç"
 #. FIXME: some warning about # of times you can enter incorrect PUK
 #: ../src/applet-device-gsm.c:1003
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
 
 #. Translators: PUK code entry label
@@ -306,8 +314,7 @@ msgstr "éæèå PIN çï"
 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:1197 ../src/applet-device-gsm.c:1203
 msgid "GSM network."
 msgstr "GSM çèã"
 
@@ -334,8 +341,7 @@ msgid "Wired Network"
 msgstr "æççè"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232
-#: ../src/applet.c:1509
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
 msgid "disconnected"
 msgstr "åæç"
 
@@ -376,113 +382,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:925
+#: ../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
-#| msgid "Failed to create PAN connection: %s"
+#: ../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:491
-#: ../src/applet.c:535
-#: ../src/applet.c:561
-#| msgid "Unknown"
+#: ../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:494
-#: ../src/applet.c:564
-#| msgid "Connection add failed"
+#: ../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
-#| msgid "Could not edit new connection"
+#: ../src/applet-device-wifi.c:1396
 msgid "Failed to add new connection"
 msgstr "çæååæéç"
 
@@ -522,8 +518,7 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "åæ WEP"
 
-#: ../src/applet-dialogs.c:113
-#: ../src/applet-dialogs.c:245
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
 #: ../src/applet-dialogs.c:247
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
@@ -532,8 +527,7 @@ msgstr "WPA/WPA2"
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
 #: ../src/connection-editor/page-wireless-security.c:265
 #: ../src/libnm-gtk/nm-wireless-dialog.c:905
 msgctxt "Wifi/wired security"
@@ -545,14 +539,12 @@ msgstr "ææ"
 msgid "%s (default)"
 msgstr "%s (éèå)"
 
-#: ../src/applet-dialogs.c:346
-#: ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "äæ"
@@ -598,8 +590,7 @@ msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432
-#: ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
 msgid "General"
 msgstr "äè"
 
@@ -638,13 +629,11 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553
-#: ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
 msgid "IP Address:"
 msgstr "IP äåï"
 
-#: ../src/applet-dialogs.c:555
-#: ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
 msgctxt "Address"
 msgid "Unknown"
 msgstr "äæ"
@@ -663,8 +652,7 @@ msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:588
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
 msgid "Default Route:"
 msgstr "éèèçï"
 
@@ -729,7 +717,8 @@ msgstr ""
 "èèååäççèçèèçèè"
 
 #: ../src/applet-dialogs.c:942
-msgid "Notification area applet for managing your network devices and connections."
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "çäççæççèèçèéççéçåéæçåã"
 
 #: ../src/applet-dialogs.c:944
@@ -753,36 +742,33 @@ msgstr "éçèã%sãéèåçã"
 msgid "Password:"
 msgstr "åçï"
 
-#: ../src/applet.c:489
-#| msgid "Failed to create PAN connection: %s"
+#: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "çæåå/äçéç"
 
-#: ../src/applet.c:533
-#| msgid "disconnected"
+#: ../src/applet.c:532
 msgid "Device disconnect failed"
 msgstr "èçæçåæ"
 
-#: ../src/applet.c:538
-#| msgid "Disconnected"
+#: ../src/applet.c:537
 msgid "Disconnect failure"
 msgstr "æçåæ"
 
-#: ../src/applet.c:559
-#| msgid "Connection add failed"
+#: ../src/applet.c:558
 msgid "Connection activation failed"
 msgstr "éççæåæ"
 
-#: ../src/applet.c:1014
+#: ../src/applet.c:1013
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåççèéçèäæäã"
 
-#: ../src/applet.c:1017
+#: ../src/applet.c:1016
 #, c-format
 msgid ""
 "\n"
@@ -791,16 +777,17 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåæåçåæäã"
 
-#: ../src/applet.c:1020
+#: ../src/applet.c:1019
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåååçæççæã"
 
-#: ../src/applet.c:1023
+#: ../src/applet.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -809,7 +796,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåçéççåèåéæã"
 
-#: ../src/applet.c:1026
+#: ../src/applet.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -818,7 +805,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåææåæååã"
 
-#: ../src/applet.c:1029
+#: ../src/applet.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -827,7 +814,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æååååæã"
 
-#: ../src/applet.c:1032
+#: ../src/applet.c:1031
 #, c-format
 msgid ""
 "\n"
@@ -836,7 +823,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåçææææç VPN æåã"
 
-#: ../src/applet.c:1035
+#: ../src/applet.c:1034
 #, c-format
 msgid ""
 "\n"
@@ -845,7 +832,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåççæç VPN æåã"
 
-#: ../src/applet.c:1042
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -854,16 +841,17 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæã"
 
-#: ../src/applet.c:1060
+#: ../src/applet.c:1059
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "VPN éçã%sãåæïåççèéçäæäã"
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -872,7 +860,7 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæïåç VPN æåååæã"
 
-#: ../src/applet.c:1069
+#: ../src/applet.c:1068
 #, c-format
 msgid ""
 "\n"
@@ -881,17 +869,29 @@ msgstr ""
 "\n"
 "VPN éçã%sãåæçã"
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:1098
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN éçåæåçã\n"
+"%s\n"
+
+#: ../src/applet.c:1100
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN éçåæåçã\n"
+
+#: ../src/applet.c:1102
 msgid "VPN Login Message"
 msgstr "VPN çéèæ"
 
-#: ../src/applet.c:1109
-#: ../src/applet.c:1117
-#: ../src/applet.c:1167
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
 msgid "VPN Connection Failed"
 msgstr "VPN éçåæ"
 
-#: ../src/applet.c:1174
+#: ../src/applet.c:1173
 #, c-format
 msgid ""
 "\n"
@@ -904,7 +904,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1177
+#: ../src/applet.c:1176
 #, c-format
 msgid ""
 "\n"
@@ -917,140 +917,139 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1496
 msgid "device not ready (firmware missing)"
 msgstr "èçåæåç (çåéé)"
 
-#: ../src/applet.c:1499
+#: ../src/applet.c:1498
 msgid "device not ready"
 msgstr "èçåæåç"
 
-#: ../src/applet.c:1525
+#: ../src/applet.c:1524
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/applet.c:1539
+#: ../src/applet.c:1538
 msgid "device not managed"
 msgstr "èççæçç"
 
-#: ../src/applet.c:1583
+#: ../src/applet.c:1582
 msgid "No network devices available"
 msgstr "ææåçççèèç"
 
-#: ../src/applet.c:1671
+#: ../src/applet.c:1670
 msgid "_VPN Connections"
 msgstr "_VPN éç"
 
-#: ../src/applet.c:1728
+#: ../src/applet.c:1727
 msgid "_Configure VPN..."
 msgstr "èç VPN(_C)â"
 
-#: ../src/applet.c:1732
+#: ../src/applet.c:1731
 msgid "_Disconnect VPN"
 msgstr "è VPN æç(_D)"
 
-#: ../src/applet.c:1830
+#: ../src/applet.c:1825
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ææåèâ."
 
-#: ../src/applet.c:1835
-#: ../src/applet.c:2634
+#: ../src/applet.c:1830 ../src/applet.c:2631
 msgid "Networking disabled"
 msgstr "çèååç"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2056
+#: ../src/applet.c:2051
 msgid "Enable _Networking"
 msgstr "åççè(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2065
+#: ../src/applet.c:2060
 msgid "Enable _Wireless"
 msgstr "åççççè(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2074
+#: ../src/applet.c:2069
 msgid "Enable _Mobile Broadband"
 msgstr "åçèååé(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2083
+#: ../src/applet.c:2078
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "åç WiMA_X èååé"
 
 #. Toggle notifications item
-#: ../src/applet.c:2094
+#: ../src/applet.c:2089
 msgid "Enable N_otifications"
 msgstr "åçéçåè(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2105
+#: ../src/applet.c:2100
 msgid "Connection _Information"
 msgstr "éçèè(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2115
+#: ../src/applet.c:2110
 msgid "Edit Connections..."
 msgstr "çèéçâ"
 
 #. Help item
-#: ../src/applet.c:2129
+#: ../src/applet.c:2124
 msgid "_Help"
 msgstr "æå(_H)"
 
 #. About item
-#: ../src/applet.c:2138
+#: ../src/applet.c:2133
 msgid "_About"
 msgstr "éæ(_A)"
 
-#: ../src/applet.c:2315
+#: ../src/applet.c:2310
 msgid "Disconnected"
 msgstr "åæç"
 
-#: ../src/applet.c:2316
+#: ../src/applet.c:2311
 msgid "The network connection has been disconnected."
 msgstr "çèéçåäæã"
 
-#: ../src/applet.c:2497
+#: ../src/applet.c:2494
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "æåæåçèéçã%sãâ"
 
-#: ../src/applet.c:2500
+#: ../src/applet.c:2497
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "çèéçã%sãéèäçèéèâ"
 
-#: ../src/applet.c:2506
+#: ../src/applet.c:2503
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "çèéçã%sãåäçä"
 
-#: ../src/applet.c:2589
+#: ../src/applet.c:2586
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "æååå VPN éçã%sãâ"
 
-#: ../src/applet.c:2592
+#: ../src/applet.c:2589
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN éçã%sãéèäçèéèâ"
 
-#: ../src/applet.c:2595
+#: ../src/applet.c:2592
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "æåèæ VPN æäã%sãççèäåâ"
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2595
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN éçã%sãåäçä"
 
-#: ../src/applet.c:2639
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "ææçèéæ"
 
-#: ../src/applet.c:3394
+#: ../src/applet.c:3327
 msgid "NetworkManager Applet"
 msgstr "NetworkManager éæçå"
 
@@ -1063,20 +1062,18 @@ msgid "_Unlock"
 msgstr "èé(_U)"
 
 #: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "åççèéç"
-
-#: ../src/info.ui.h:2
 msgid "Connection Information"
 msgstr "éçèè"
 
-#: ../src/wired-8021x.ui.h:1
-#: ../src/wired-dialog.c:104
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "åççèéç"
+
+#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
 msgid "Wired 802.1X authentication"
 msgstr "æççè 802.1X éè"
 
-#: ../src/wired-8021x.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "çèåç(_N)ï"
 
@@ -1090,385 +1087,421 @@ 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-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 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."
-msgstr "åæåçïéåéçåæéäæåçéèçèéçã"
+msgid "Ig_nore automatically obtained routes"
+msgstr "åçèåçåçèç(_N)"
 
 #: ../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 "åçèåçåçèç(_N)"
+msgid "_Use this connection only for resources on its network"
+msgstr "ååäçéåéçççèèææïæäçæéç(_U)"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "_Use this connection only for resources on its network"
-msgstr "ååäçéåéçççèèææïæäçæéç(_U)"
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "åæåçïéåéçåæéäæåçéèçèéçã"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 #: ../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-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-msgid "Addresses"
-msgstr "åå"
-
-#: ../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-wired.ui.h:1
+#: ../src/connection-editor/ce-page-wireless.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
+#: ../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:4
-msgid "D_HCP client ID:"
-msgstr "D_HCP çæç ID:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "ææéç"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "çäèæäæåçççåãèäçéèééäåççåã"
+#: ../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:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
 #: ../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."
-msgstr "çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåçäåã"
+msgid "_Method:"
+msgstr "ææ(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "ææéç"
+msgid "Addresses"
+msgstr "åå"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
-msgid "Manual"
-msgstr "æå"
+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 çæçè"
+"åïèåæèåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "éè IPv_4 addressing æååææéç"
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr "çäèæäæåçççåãèäçéèééäåççåã"
 
 #: ../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 "S_earch domains:"
 msgstr "æåçå(_E):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../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:13
-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 çæçèåïèåæèåã"
+#: ../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 äæå:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-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-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 ""
+"çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåç"
+"äåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_DNS servers:"
-msgstr "_DNS äæå:"
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "éè IPv_4 addressing æååææéç"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Method:"
-msgstr "ææ(_M):"
+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 "_Routesâ"
 msgstr "èç(_R)â"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "éè IPv_6 addressing æååææéç"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "çéèåäç IPv4 ççèæïè IPv6 éçåæïäé IPv4 éçåæåçèïèåèéçåæã"
+#: ../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 éçåæåçèïèå"
+"èéçåæã"
 
 #: ../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 "åæåççèçæäçïåèäçæé(_R)"
+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 "åæ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "èæâ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "N_etwork ID:"
-msgstr "çè ID(_E):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "æå(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "P_IN:"
-msgstr "P_IN:"
+msgid "Advanced"
+msgstr "éé"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "åå 2G (GPRS/EDGE)"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "åå 3G (UMTS/HSPA)"
+msgid "N_etwork ID:"
+msgstr "çè ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "Sho_w passwords"
-msgstr "éçåç(_W)"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "éå(_T)ï"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
+msgid "Change..."
+msgstr "èæâ"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+msgid "P_IN:"
+msgstr "P_IN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "éå(_T)ï"
+msgid "Allow _roaming if home network is not available"
+msgstr "åæåççèçæäçïåèäçæé(_R)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+msgid "Sho_w passwords"
+msgstr "éçåç(_W)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "åè _BSD èæåç"
+msgid "Authentication"
+msgstr "éè"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "åè _Deflate èæåç"
-
-#: ../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 èæåç"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "äç TCP æéåç(_H)"
+msgid "Allow _Deflate data compression"
+msgstr "åè _Deflate èæåç"
 
 #: ../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)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "åé PPP åéåå(_E)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+msgid "Twisted Pair (TP)"
+msgstr "éçç (TP)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+msgid "Attachment Unit Interface (AUI)"
+msgstr "éååääé (AUI)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+msgid "BNC"
+msgstr "BNC"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "éååääé (AUI)"
+msgid "Media Independent Interface (MII)"
+msgstr "åéççäé (MII)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "èååè(_O)"
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:9
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "C_loned MAC address:"
-msgstr "èèç MAC äå(_L):"
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "Full duple_x"
-msgstr "åéå(_X)"
+msgid "_Port:"
+msgstr "éæå(_P)ï"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "åéççäé (MII)"
+msgid "_Speed:"
+msgstr "éå(_S)ï"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-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"
-msgstr "åéèèåç MAC äåææçéåéçäçççèèçççéäåãéååèäçç MAC èèæåèãäåï00:11:22:33:44:55"
+msgid "Full duple_x"
+msgstr "åéå(_X)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "éçç (TP)"
+msgid "Aut_onegotiate"
+msgstr "èååè(_O)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "_Device MAC address:"
 msgstr "èçç MAC äå(_D):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "èèç MAC äå(_L):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "éæå(_P)ï"
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
+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"
+msgstr ""
+"åéèèåç MAC äåææçéåéçäçççèèçççéäåãéååèäçç "
+"MAC èèæåèãäåï00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "éå(_S)ï"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "_MTU:"
+msgstr "_MTU:"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "bytes"
 msgstr "äåç"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wireless.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-wireless.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:8
+#: ../src/connection-editor/ce-page-wireless.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-wireless.ui.h:5
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "SS_ID:"
-msgstr "SS_ID:"
+msgid "mW"
+msgstr "mW"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
+msgid "Transmission po_wer:"
+msgstr "åèèè(_W):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:13
-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"
+msgid "Mb/s"
+msgstr "Mb/s"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
-msgstr "åèèè(_W):"
+msgid "_Rate:"
+msgstr "éç(_R):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:15
+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-wireless.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
+msgid "C_hannel:"
+msgstr "éé(_H)ï"
+
 #: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
-msgstr "éç(_R):"
+msgid "Ban_d:"
+msgstr "éå(_D):"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
+msgid "M_ode:"
+msgstr "æå(_O)ï"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+msgid "SS_ID:"
+msgstr "SS_ID:"
 
 #: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "S_ecurity:"
@@ -1479,51 +1512,54 @@ 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"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge Handshake éèéèåå"
-
-#: ../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"
+
 #: ../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 "Microsoft Challenge Handshake éèéèåå"
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake éèéèåå"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake éèéèååç 2 ç"
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "åçéèéèåå"
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake éèéèåå"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake éèéèååç 2 ç"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+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/connection-editor/ce-vpn-wizard.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
@@ -1537,29 +1573,34 @@ msgid "Choose a VPN Connection Type"
 msgstr "èéæ VPN çéçéå"
 
 #: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Createâ"
-msgstr "åçâ"
+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/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."
-msgstr "éæææèçåæéçäç VPN éåãåæææèåçç VPN éçéåææåçåæåäïåèæææåèæçç VPN åæçåã"
+msgid "Createâ"
+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 "éèé"
 
@@ -1569,12 +1610,12 @@ 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 "åç"
 
 #: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 #: ../src/connection-editor/nm-connection-list.c:1518
 msgid "DSL"
 msgstr "DSL"
@@ -1583,7 +1624,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"
@@ -1635,16 +1676,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 "éåçæåçåï domains:"
+
+#: ../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 äçèäéã"
 
@@ -1653,7 +1704,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 "åç"
 
@@ -1661,16 +1712,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 äçèäéã"
 
@@ -1688,7 +1739,9 @@ msgid "Select Mobile Broadband Provider Type"
 msgstr "éæèååéäæåéå"
 
 #: ../src/connection-editor/page-mobile.c:674
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
 msgstr "èéææçççåéäæåæäççæèãåææäçåïèæèäæåã"
 
 #: ../src/connection-editor/page-mobile.c:679
@@ -1744,7 +1797,7 @@ 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-editor.ui.h:7
 #: ../src/connection-editor/nm-connection-list.c:1514
 msgid "VPN"
 msgstr "VPN"
@@ -1766,11 +1819,15 @@ msgstr "VPN éç %d"
 
 #: ../src/connection-editor/page-wired.c:89
 #: ../src/connection-editor/page-wireless.c:94
-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"
+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:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #: ../src/connection-editor/nm-connection-list.c:1502
 msgid "Wired"
 msgstr "æç"
@@ -1809,7 +1866,7 @@ msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
 #: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 #: ../src/connection-editor/nm-connection-list.c:1506
 msgid "Wireless"
 msgstr "çççè"
@@ -1860,58 +1917,60 @@ 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
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
+#: ../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 "éèäååéåéççæéèäçææäçèã"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "ææäçèçåç"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Import"
+msgstr "åå(_I)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "èåéç(_A)"
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+msgid "E_xport"
+msgstr "åå(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 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:10
+msgid "Connect _automatically"
+msgstr "èåéç(_A)"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "åå(_I)"
+msgid "A_vailable to all users"
+msgstr "ææäçèçåç"
 
 #: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
@@ -1979,7 +2038,9 @@ msgstr "åååçèåæççéè"
 #: ../src/connection-editor/nm-connection-list.c:546
 #: ../src/connection-editor/nm-connection-list.c:719
 #: ../src/connection-editor/nm-connection-list.c:885
-msgid "The connection editor dialog could not be initialized due to an unknown error."
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr "çæäæçéèäéççèååèççæåååã"
 
 #: ../src/connection-editor/nm-connection-list.c:557
@@ -2093,7 +2154,8 @@ msgstr "æäå UUIDã%sãçéç"
 #: ../src/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN connection information\n"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -2193,7 +2255,9 @@ msgid "could not find the Bluetooth device."
 msgstr "æäåèçèçã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:980
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
+msgid ""
+"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+"Networking connection."
 msgstr "éèçèçéæååéåèåææçèéçååçã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1012
@@ -2207,7 +2271,8 @@ msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1031
 #, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1098
@@ -2218,48 +2283,58 @@ msgstr "äçææäççèèçïPAN/NAPï"
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "äçææååçéçèïDUNï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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 "æçææ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
-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 "çåïææææéåçèåïéèåéäæçèååéäæåãåæéçåæïæææçæååçèèæïèææèåãèäæèååééççèåïèåãççã >> ãååèåãäïéæãçèéçãã"
+#: ../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 "
+"resources, double-check your settings.  To modify your mobile broadband "
+"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 "çèèååéèå"
 
-#: ../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)ï"
 
-#: ../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ïAccess Point Nameïååéåçïï"
 
-#: ../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"
+"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 ""
@@ -2267,99 +2342,101 @@ msgstr ""
 "\n"
 "åææäçåæäççææïèæèäæåïäåçææç APN çäã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:542
 msgid "Choose your Billing Plan"
 msgstr "éææçèèææ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:590
 msgid "My plan is not listed..."
 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):"
 
-#: ../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
-msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
+#: ../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 "åéèèææçåç"
 
-#: ../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ïååéåçï"
 
-#: ../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 "æçèååééç"
 
@@ -2373,7 +2450,9 @@ 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'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "éèåçææååééäååçççèã%sãã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1162
@@ -2405,31 +2484,38 @@ msgid "Hidden wireless network"
 msgstr "éèççççè"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-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."
 msgstr "èåæèéæçéèçççèçåçèååæèçèæã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wireless _security:"
+msgstr "çççèåå(_W):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "éç(_N):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wireless _adapter:"
 msgstr "çççèå(_A)ï"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "çççèåå(_W):"
-
 #: ../src/main.c:73
 msgid "Usage:"
 msgstr "çæ:"
 
 #: ../src/main.c:75
-msgid "This program is a component of NetworkManager (http://projects.gnome.org/NetworkManager)."
-msgstr "æçåæ NetworkManagerïhttp://projects.gnome.org/NetworkManagerïçåä";
+msgid ""
+"This program is a component of 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."
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
 msgstr "çäå GNOME æéçåäéèïèäæäçåäåã"
 
 #: ../src/mb-menu-item.c:57
@@ -2490,14 +2576,12 @@ msgstr "æåä"
 msgid "registration denied"
 msgstr "èåèæ"
 
-#: ../src/mb-menu-item.c:151
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, 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:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%sïæéï"
@@ -2516,63 +2600,69 @@ msgstr "æéçè"
 msgid "Default"
 msgstr "éè"
 
-#: ../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)."
+#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
 
-#: ../src/wireless-security/eap-method.c:279
+#: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "æéæääæèææåä(CA)æè"
 
-#: ../src/wireless-security/eap-method.c:280
-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?"
-msgstr "ääçæèäå (CA) çæèæéæéçäååãææçççè(åèèçåãåèäæ)ãæåèéæäåæèäåçæèï"
+#: ../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?"
+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-fast.ui.h:2
-msgid "Allow automatic PAC pro_visioning"
-msgstr "åèèåäæ PAC (_V)"
-
-#: ../src/wireless-security/eap-method-fast.ui.h:3
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "Anony_mous identity:"
-msgstr "ååèå(_M)ï"
-
-#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Anonymous"
 msgstr "åå"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "åéè"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "åè"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../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-fast.ui.h:6
 msgid "PAC _file:"
 msgstr "PAC ææ(_F):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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 "_Inner authentication:"
 msgstr "åééè(_I):"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "åèèåäæ PAC (_V)"
+
 #: ../src/wireless-security/eap-method-fast.c:261
 #: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
@@ -2601,25 +2691,25 @@ msgstr "MD5"
 msgid "Choose a Certificate Authority certificate..."
 msgstr "éææèææåä(CA)æèâ"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "çæ 0"
+
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+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 "CA æè(_A)ï"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
 msgstr "PEAP çæ(_V):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "Version 0"
-msgstr "çæ 0"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-msgid "Version 1"
-msgstr "çæ 1"
-
-#: ../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)"
 
@@ -2629,11 +2719,14 @@ msgstr "æååççåééæäååç"
 
 #: ../src/wireless-security/eap-method-tls.c:249
 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"
+"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 ""
-"æéæççåééääææåçäèã éåèæåèäååçåæãèéæçåçäèççåééã\n"
+"æéæççåééääææåçäèã éåèæåèäååçåæãèéæçåçäè"
+"ççåééã\n"
 "\n"
 "ïæåääç openssl äååæççåééï"
 
@@ -2645,11 +2738,15 @@ msgstr "éææçåäæèâ"
 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 "èå(_D)ï"
 
-#: ../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)ï"
 
@@ -2657,10 +2754,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)"
@@ -2690,46 +2783,46 @@ msgid "Protected EAP (PEAP)"
 msgstr "äèå EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
 msgstr "éè(_E):"
 
 #: ../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:6
-msgid "Open System"
-msgstr "éæçç"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "Shared Key"
-msgstr "åäéé"
+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:9
+#: ../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 "_Security:"
 #~ msgstr "ååæ(_S)ï"



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