[network-manager-applet] po/vi: import from Damned Lies



commit 766b1c72ed7b780387c288ca740b93478381331d
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Sat Oct 1 11:46:38 2011 +1000

    po/vi: import from Damned Lies

 po/vi.po | 1310 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 588 insertions(+), 722 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 3b30472..f6849f0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-04-04 17:51+0000\n"
-"PO-Revision-Date: 2011-06-12 22:34+0700\n"
+"POT-Creation-Date: 2011-09-30 08:39+0000\n"
+"PO-Revision-Date: 2011-10-01 11:46+1000\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,10 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
 #: ../nm-applet.desktop.in.h:1
-#| msgid "No network connection"
 msgid "Manage your network connections"
 msgstr "Quán là kát nái máng"
 
 #: ../nm-applet.desktop.in.h:2
-#| msgid "_Wired Network"
 msgid "Network"
 msgstr "Máng"
 
@@ -73,159 +71,169 @@ msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "DÃng Äá xÃc Äánh thiát láp cà ÄÆác chuyán sang phiÃn bán mái khÃng."
 
 #: ../nm-connection-editor.desktop.in.h:1
-#| msgid "Manage Virtual Private Network Connections"
 msgid "Manage and change your network connection settings"
 msgstr "Quán là và thay Äái thiát láp kát nái máng"
 
 #: ../nm-connection-editor.desktop.in.h:2
 #: ../src/connection-editor/nm-connection-editor.ui.h:7
-#| msgid "No network connection"
 msgid "Network Connections"
 msgstr "Kát nái máng"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
-#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
+#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "DÃng ÄÆác"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
-#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
+#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
 #: ../src/applet-device-wimax.c:423
 #, c-format
-#| msgid "You are now connected to the wireless network '%s'."
 msgid "You are now connected to '%s'."
 msgstr "Bán ÄÃ kát nái Äán máng '%s'."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
-#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
+#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Kát nái ÄÆác thiát láp"
 
 #: ../src/applet-device-bt.c:205
-#| msgid "You are now connected to the wired network."
 msgid "You are now connected to the mobile broadband network."
 msgstr "Bán ÄÃ kát nái Äán máng di Äáng bÄng thÃng ráng."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Äang chuán bá kát nái di Äáng bÄng thÃng ráng '%s'..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Äang cáu hÃnh kát nái di Äáng bÄng thÃng ráng '%s'..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
-#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
+#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Cán xÃc thác cho kát nái di Äáng bÄng thÃng ráng '%s'..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
-#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2383
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
+#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2479
 #, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
 msgid "Requesting a network address for '%s'..."
 msgstr "Äang láy Äáa chá máng cho '%s'..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
+#: ../src/applet-device-gsm.c:552
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Kát nái di Äáng bÄng thÃng ráng '%s' ÄÃ hoát Äáng"
 
-#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../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:283 ../src/applet-device-gsm.c:327
-#: ../src/applet-dialogs.c:405
+#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
+#: ../src/applet-dialogs.c:430
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Di Äáng bÄng thÃng ráng (%s)"
 
-#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
-#: ../src/connection-editor/page-mobile.c:372
+#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
+#: ../src/connection-editor/page-mobile.c:379
 #: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1440
+#: ../src/connection-editor/nm-connection-list.c:1474
 msgid "Mobile Broadband"
 msgstr "Di Äáng bÄng thÃng ráng"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:412
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Kát nái di Äáng bÄng thÃng ráng (CDMA) mái..."
 
-#: ../src/applet-device-cdma.c:384
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-cdma.c:446
 msgid "You are now connected to the CDMA network."
 msgstr "Bán ÄÃ kát nái Äán máng CDMA."
 
-#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
 #: ../src/applet-device-wimax.c:482
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Kát nái di Äáng bÄng thÃng ráng '%s' ÄÃ hoát Äáng: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:550
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "chuyán vÃng"
 
-#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+#, fuzzy
+#| msgid "More networks"
+msgid "CDMA network."
+msgstr "ThÃm máng"
+
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "You are now registered on the home network."
+msgstr "Bán Äà kát nái Äán máng cà dÃy."
+
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "You are now registered on a roaming network."
+msgstr "Bán Äà kát nái Äán máng cà dÃy."
+
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:394
+#: ../src/applet-device-gsm.c:456
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Kát nái di Äáng bÄng thÃng ráng (GSM) mái..."
 
-#: ../src/applet-device-gsm.c:428
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-gsm.c:490
 msgid "You are now connected to the GSM network."
 msgstr "Bán ÄÃ kát nái Äán máng GSM."
 
-#: ../src/applet-device-gsm.c:589
+#: ../src/applet-device-gsm.c:651
 msgid "PIN code required"
 msgstr "Cán mà PIN"
 
-#: ../src/applet-device-gsm.c:597
+#: ../src/applet-device-gsm.c:659
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cán mà PIN cho thiát bá di Äáng bÄng thÃng ráng"
 
-#: ../src/applet-device-gsm.c:718
+#: ../src/applet-device-gsm.c:784
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Sai mà PIN; vui lÃng liÃn lác nhà cung cáp."
 
-#: ../src/applet-device-gsm.c:741
+#: ../src/applet-device-gsm.c:807
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Sai mà PUK; vui lÃng liÃn lác nhà cung cáp."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:768
+#: ../src/applet-device-gsm.c:834
 msgid "Sending unlock code..."
 msgstr "Äang gái mà má khoÃ..."
 
-#: ../src/applet-device-gsm.c:831
+#: ../src/applet-device-gsm.c:897
 msgid "SIM PIN unlock required"
 msgstr "Cán PIN má khoà SIM"
 
-#: ../src/applet-device-gsm.c:832
+#: ../src/applet-device-gsm.c:898
 msgid "SIM PIN Unlock Required"
 msgstr "Cán PIN má khoà SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:834
+#: ../src/applet-device-gsm.c:900
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -234,25 +242,25 @@ msgstr ""
 "Thiát bá di Äáng bÄng thÃng ráng '%s' cán mà PIN SIM trÆác khi cà thá dÃng."
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:836
+#: ../src/applet-device-gsm.c:902
 msgid "PIN code:"
 msgstr "MÃ PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:840
+#: ../src/applet-device-gsm.c:906
 msgid "Show PIN code"
 msgstr "Hián mà PIN"
 
-#: ../src/applet-device-gsm.c:843
+#: ../src/applet-device-gsm.c:909
 msgid "SIM PUK unlock required"
 msgstr "Cán PUK má khoà SIM"
 
-#: ../src/applet-device-gsm.c:844
+#: ../src/applet-device-gsm.c:910
 msgid "SIM PUK Unlock Required"
 msgstr "Cán PUK má khoà SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:846
+#: ../src/applet-device-gsm.c:912
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -261,32 +269,37 @@ msgstr ""
 "Thiát bá di Äáng bÄng thÃng ráng '%s' cán mà PUK SIM trÆác khi cà thá dÃng."
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:848
+#: ../src/applet-device-gsm.c:914
 msgid "PUK code:"
 msgstr "MÃ PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:851
+#: ../src/applet-device-gsm.c:917
 msgid "New PIN code:"
 msgstr "MÃ PIN mái:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:853
+#: ../src/applet-device-gsm.c:919
 msgid "Re-enter new PIN code:"
 msgstr "Nháp lái mà PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:858
+#: ../src/applet-device-gsm.c:924
 msgid "Show PIN/PUK codes"
 msgstr "Hián mà PIN/PUK"
 
+#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
+#, fuzzy
+#| msgid "More networks"
+msgid "GSM network."
+msgstr "ThÃm máng"
+
 #: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "Ethernet tá Äáng"
 
 #: ../src/applet-device-wired.c:205
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Wired Networks (%s)"
 msgstr "Máng dÃy (%s)"
 
@@ -296,18 +309,15 @@ msgid "Wired Network (%s)"
 msgstr "Máng dÃy (%s)"
 
 #: ../src/applet-device-wired.c:210
-#| msgid "_Wired Network"
 msgid "Wired Networks"
 msgstr "Máng dÃy"
 
 #: ../src/applet-device-wired.c:212
-#| msgid "_Wired Network"
 msgid "Wired Network"
 msgstr "Máng dÃy"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
-#| msgid "Disconnected"
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
 msgid "disconnected"
 msgstr "ÄÃ ngát kát nái"
 
@@ -317,13 +327,11 @@ msgstr "Bán Äà kát nái Äán máng cà dÃy."
 
 #: ../src/applet-device-wired.c:300
 #, c-format
-#| msgid "Wired network connection"
 msgid "Preparing wired network connection '%s'..."
 msgstr "Äang chuán bá kát nái máng dÃy '%s'..."
 
 #: ../src/applet-device-wired.c:303
 #, c-format
-#| msgid "Wired network connection"
 msgid "Configuring wired network connection '%s'..."
 msgstr "Äang cáu hÃnh kát nái máng dÃy '%s'..."
 
@@ -334,127 +342,105 @@ msgstr "Cán xÃc thác cho kát nái máng dÃy '%s'..."
 
 #: ../src/applet-device-wired.c:309
 #, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
 msgid "Requesting a wired network address for '%s'..."
 msgstr "Äang láy Äáa chá cho máng dÃy '%s'..."
 
 #: ../src/applet-device-wired.c:313
 #, c-format
-#| msgid "Wired network connection"
 msgid "Wired network connection '%s' active"
 msgstr "Kát nái máng dÃy '%s' ÄÃ hoát Äáng"
 
 #: ../src/applet-device-wired.c:494
-#| msgid "Authentication:"
 msgid "DSL authentication"
 msgstr "XÃc thác DSL"
 
-#: ../src/applet-device-wifi.c:89
-#| msgid "_Connect to Other Wireless Network..."
+#: ../src/applet-device-wifi.c:97
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "_Kát nái tái máng khÃng dÃy án..."
 
-#: ../src/applet-device-wifi.c:142
+#: ../src/applet-device-wifi.c:150
 msgid "Create _New Wireless Network..."
 msgstr "Táo má_ng khÃng dÃy mái..."
 
-#: ../src/applet-device-wifi.c:226
-#| msgid "none"
+#: ../src/applet-device-wifi.c:294
 msgid "(none)"
 msgstr "(khÃng)"
 
-#: ../src/applet-device-wifi.c:795
+#: ../src/applet-device-wifi.c:803
 #, c-format
-#| msgid "Wireless Network (%s)"
-#| msgid_plural "Wireless Networks (%s)"
 msgid "Wireless Networks (%s)"
 msgstr "Máng khÃng dÃy (%s)"
 
-#: ../src/applet-device-wifi.c:797
+#: ../src/applet-device-wifi.c:805
 #, c-format
-#| msgid "Wireless Network (%s)"
-#| msgid_plural "Wireless Networks (%s)"
 msgid "Wireless Network (%s)"
 msgstr "Máng khÃng dÃy (%s)"
 
-#: ../src/applet-device-wifi.c:799
+#: ../src/applet-device-wifi.c:807
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Máng khÃng dÃy"
 
-#: ../src/applet-device-wifi.c:832
-#| msgid "Networking disabled"
+#: ../src/applet-device-wifi.c:840
 msgid "wireless is disabled"
 msgstr "khÃng dÃy bá tát"
 
-#: ../src/applet-device-wifi.c:833
+#: ../src/applet-device-wifi.c:841
 msgid "wireless is disabled by hardware switch"
 msgstr "khÃng dÃy bá tát phán cáng"
 
-#: ../src/applet-device-wifi.c:894
-#| msgid "_Wired Network"
+#: ../src/applet-device-wifi.c:902
 msgid "More networks"
 msgstr "ThÃm máng"
 
-#: ../src/applet-device-wifi.c:1073
-#| msgid "Wireless Network"
-#| msgid_plural "Wireless Networks"
+#: ../src/applet-device-wifi.c:1081
 msgid "Wireless Networks Available"
 msgstr "Máng khÃng dÃy dÃng ÄÆác"
 
-#: ../src/applet-device-wifi.c:1075
-#| msgid "Finishing connection to the wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1083
 msgid "Click on this icon to connect to a wireless network"
 msgstr "Nhán biáu tÆáng Äá kát nái máng khÃng dÃy"
 
-#: ../src/applet-device-wifi.c:1076
-#| msgid "Error connecting to wireless network"
+#: ../src/applet-device-wifi.c:1084
 msgid "Use the network menu to connect to a wireless network"
 msgstr "DÃng trÃnh ÄÆn máng Äá kát nái máng khÃng dÃy"
 
-#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
-#| msgid "_Don't remind me again"
+#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
 msgid "Don't show this message again"
 msgstr "Äáng nhác náa"
 
-#: ../src/applet-device-wifi.c:1271
+#: ../src/applet-device-wifi.c:1279
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Bán Äà kát nái Äán máng khÃng dÃy  %s Â."
 
-#: ../src/applet-device-wifi.c:1302
+#: ../src/applet-device-wifi.c:1310
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Äang chuán bá kát nái máng khÃng dÃy '%s'..."
 
-#: ../src/applet-device-wifi.c:1305
+#: ../src/applet-device-wifi.c:1313
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
 msgid "Configuring wireless network connection '%s'..."
 msgstr "Äang cáu hÃnh kát nái máng khÃng dÃy '%s'..."
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1316
 #, c-format
-#| msgid "Preparing device %s for the wireless network '%s'..."
 msgid "User authentication required for wireless network '%s'..."
 msgstr "Cán xÃc thác cho kát nái máng khÃng dÃy '%s'..."
 
-#: ../src/applet-device-wifi.c:1311
+#: ../src/applet-device-wifi.c:1319
 #, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Äang láy Äáa chá máng khÃng dÃy '%s'..."
 
-#: ../src/applet-device-wifi.c:1332
+#: ../src/applet-device-wifi.c:1340
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Kát nái máng khÃng dÃy '%s' ÄÃ hoát Äáng: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1337
+#: ../src/applet-device-wifi.c:1345
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
 msgid "Wireless network connection '%s' active"
 msgstr "Kát nái máng khÃng dÃy '%s' ÄÃ hoát Äáng"
 
@@ -476,199 +462,219 @@ msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX bá tát phán cáng"
 
 #: ../src/applet-device-wimax.c:428
-#| msgid "You are now connected to the wired network."
 msgid "You are now connected to the WiMAX network."
 msgstr "Bán ÄÃ kát nái Äán máng WiMAX."
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "Gáp lái khi hián thá thÃng tin kát nái:"
 
-#: ../src/applet-dialogs.c:108
+#: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/wireless-dialog.c:946
-#: ../src/wireless-security/wireless-security.c:392
+#: ../src/libnm-gtk/nm-wireless-dialog.c:949
+#: ../src/wireless-security/wireless-security.c:396
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "WEP Äáng"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
+#: ../src/applet-dialogs.c:248
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#: ../src/applet-dialogs.c:244
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
+#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
 #: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/wireless-dialog.c:903
-#| msgid "None"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:906
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
 #, c-format
-#| msgid "%d Mb/s"
 msgid "%u Mb/s"
 msgstr "%u Mb/giÃy"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "KhÃng rÃ"
 
-#: ../src/applet-dialogs.c:342
+#: ../src/applet-dialogs.c:367
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:344
-#| msgid "(unknown)"
+#: ../src/applet-dialogs.c:369
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "khÃng rÃ"
 
-#: ../src/applet-dialogs.c:356
-#| msgid "(unknown)"
+#: ../src/applet-dialogs.c:381
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "khÃng rÃ"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:416
 #, c-format
-#| msgid "Wired Ethernet (%s)"
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:419
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:426
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:428
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:432
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:438 ../src/applet-dialogs.c:797
 msgid "General"
 msgstr "Chung"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:442
 msgid "Interface:"
 msgstr "Giao dián:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:458
 msgid "Hardware Address:"
 msgstr "Äáa chá phán cáng:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:466
 msgid "Driver:"
 msgstr "TrÃnh Äiáu khián:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:495
 msgid "Speed:"
 msgstr "Tác Äá:"
 
-#: ../src/applet-dialogs.c:480
-#| msgid "_Wireless Security:"
+#: ../src/applet-dialogs.c:505
 msgid "Security:"
 msgstr "An ninh:"
 
-#: ../src/applet-dialogs.c:493
+#: ../src/applet-dialogs.c:518
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:506
+#: ../src/applet-dialogs.c:531
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:548
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
+#: ../src/applet-dialogs.c:559 ../src/applet-dialogs.c:666
 msgid "IP Address:"
 msgstr "Äáa chá IP:"
 
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
 msgctxt "Address"
 msgid "Unknown"
 msgstr "KhÃng rÃ"
 
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:575
 msgid "Broadcast Address:"
 msgstr "Äáa chá quáng bÃ:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:559
+#: ../src/applet-dialogs.c:584
 msgid "Subnet Mask:"
 msgstr "Mát ná máng:"
 
-#: ../src/applet-dialogs.c:561
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:586
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "KhÃng rÃ"
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
 msgid "Default Route:"
 msgstr "Tuyán mác Äánh:"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:606
 msgid "Primary DNS:"
 msgstr "DNS chÃnh:"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:615
 msgid "Secondary DNS:"
 msgstr "DNS phá:"
 
-#: ../src/applet-dialogs.c:600
-#| msgid "Secondary DNS:"
+#: ../src/applet-dialogs.c:625
 msgid "Ternary DNS:"
 msgstr "DNS thá ba:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:640
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
+#: ../src/applet-dialogs.c:649
 msgid "Ignored"
 msgstr "Bá qua"
 
+#: ../src/applet-dialogs.c:802
+#, fuzzy
+#| msgid "_Type:"
+msgid "VPN Type:"
+msgstr "_Kiáu:"
+
+#: ../src/applet-dialogs.c:809
+#, fuzzy
+#| msgid "Gateway"
+msgid "VPN Gateway:"
+msgstr "Cáng"
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+#| msgid "_Username:"
+msgid "VPN Username:"
+msgstr "_TÃn ngÆái dÃng:"
+
+#: ../src/applet-dialogs.c:821
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:827
+#, fuzzy
+#| msgid "Co_nnection:"
+msgid "Base Connection:"
+msgstr "_Kát nái:"
+
+#: ../src/applet-dialogs.c:829
+#, fuzzy
+#| msgctxt "Speed"
+#| msgid "Unknown"
+msgid "Unknown"
+msgstr "KhÃng rÃ"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
-#| msgid "No active connections!"
+#: ../src/applet-dialogs.c:892
 msgid "No valid active connections found!"
 msgstr "KhÃng cà kát nái hoát Äáng!"
 
-#: ../src/applet-dialogs.c:785
-#| msgid ""
-#| "Copyright  2004-2006 Red Hat, Inc.\n"
-#| "Copyright  2005-2006 Novell, Inc."
+#: ../src/applet-dialogs.c:945
 msgid ""
 "Copyright  2004-2011 Red Hat, Inc.\n"
 "Copyright  2005-2008 Novell, Inc.\n"
@@ -678,36 +684,34 @@ msgstr ""
 "Copyright  2005-2008 Novell, Inc.\n"
 "và nhiáu dách giá, cÃng tÃc viÃn khÃc"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:948
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ChÆÆng trÃnh quán là cÃc thiát bá và kát nái máng cáa bán."
 
-#: ../src/applet-dialogs.c:790
-#| msgid "NetworkManager Applet"
+#: ../src/applet-dialogs.c:950
 msgid "NetworkManager Website"
 msgstr "Trang web NetworkManager"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:965
 msgid "Missing resources"
 msgstr "Thiáu tÃi nguyÃn"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:990
 msgid "Mobile broadband network password"
 msgstr "Mát kháu máng di Äáng bÄng thÃng ráng"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:999
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Cán mát kháu Äá kát nái '%s'."
 
-#: ../src/applet-dialogs.c:854
+#: ../src/applet-dialogs.c:1018
 msgid "Password:"
 msgstr "Mát kháu:"
 
-#: ../src/applet.c:894
+#: ../src/applet.c:990
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the network connection was "
@@ -716,7 +720,7 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và kát nái máng bá ngát."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -725,11 +729,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và dách vá VPN dáng Äát ngát."
 
-#: ../src/applet.c:900
+#: ../src/applet.c:996
 #, c-format
-#| msgid ""
-#| "Could not start the VPN connection '%s' because the VPN server did not "
-#| "return an adequate network configuration."
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service returned invalid "
@@ -738,9 +739,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và dách vá VPN trá vá cáu hÃnh khÃng háp lá."
 
-#: ../src/applet.c:903
+#: ../src/applet.c:999
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
@@ -748,11 +748,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và hát hán kát nái."
 
-#: ../src/applet.c:906
+#: ../src/applet.c:1002
 #, c-format
-#| msgid ""
-#| "Could not start the VPN connection '%s' because the VPN server did not "
-#| "return an adequate network configuration."
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
@@ -760,7 +757,7 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và dách vá VPN khÃng khái Äáng káp."
 
-#: ../src/applet.c:909
+#: ../src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -769,7 +766,7 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và dách vá VPN khÃng khái Äáng ÄÆác."
 
-#: ../src/applet.c:912
+#: ../src/applet.c:1008
 #, c-format
 msgid ""
 "\n"
@@ -778,9 +775,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và khÃng cà bà mát VPN háp lá."
 
-#: ../src/applet.c:915
+#: ../src/applet.c:1011
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
@@ -788,9 +784,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái và bà mát VPN khÃng háp lá."
 
-#: ../src/applet.c:922
+#: ../src/applet.c:1018
 #, c-format
-#| msgid "VPN connection to '%s'"
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
@@ -798,9 +793,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' lái."
 
-#: ../src/applet.c:940
+#: ../src/applet.c:1036
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the network connection was "
@@ -809,9 +803,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' bá ngát và kát nái máng bá ngát."
 
-#: ../src/applet.c:943
+#: ../src/applet.c:1039
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
@@ -819,9 +812,8 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' bá ngát và dách vá VPN dáng Äát ngát."
 
-#: ../src/applet.c:949
+#: ../src/applet.c:1045
 #, c-format
-#| msgid "The network connection has been disconnected."
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
@@ -829,16 +821,15 @@ msgstr ""
 "\n"
 "Kát nái VPN '%s' bá ngát."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:1079
 msgid "VPN Login Message"
 msgstr "ThÃng Äiáp ÄÄng nháp VPN"
 
-#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
-#| msgid "VPN Connect Failure"
+#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
 msgid "VPN Connection Failed"
 msgstr "Lái kát nái VPN"
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:1150
 #, c-format
 msgid ""
 "\n"
@@ -851,9 +842,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:1153
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "\n"
 "The VPN connection '%s' failed to start.\n"
@@ -865,148 +855,139 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1377
+#: ../src/applet.c:1473
 msgid "device not ready (firmware missing)"
 msgstr "thiát bá chÆa sán sÃng (thiáu firmware)"
 
-#: ../src/applet.c:1379
+#: ../src/applet.c:1475
 msgid "device not ready"
 msgstr "thiát bá chÆa sán sÃng"
 
-#: ../src/applet.c:1405
-#| msgid "Disconnected"
+#: ../src/applet.c:1501
 msgid "Disconnect"
 msgstr "Ngát kát nái"
 
-#: ../src/applet.c:1419
+#: ../src/applet.c:1515
 msgid "device not managed"
 msgstr "thiát bá khÃng ÄÆác quán lÃ"
 
-#: ../src/applet.c:1463
-#| msgid "No network devices have been found"
+#: ../src/applet.c:1559
 msgid "No network devices available"
 msgstr "KhÃng tÃm tháy thiát bá máng dÃng ÄÆác"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1647
 msgid "_VPN Connections"
 msgstr "Kát nái _VPN"
 
-#: ../src/applet.c:1608
+#: ../src/applet.c:1704
 msgid "_Configure VPN..."
 msgstr "_Cáu hÃnh VPN..."
 
-#: ../src/applet.c:1612
-#| msgid "_Disconnect VPN..."
+#: ../src/applet.c:1708
 msgid "_Disconnect VPN"
 msgstr "N_gát kát nái VPN"
 
-#: ../src/applet.c:1710
+#: ../src/applet.c:1806
 msgid "NetworkManager is not running..."
 msgstr "TrÃnh Quán là Máng Äang khÃng cháy..."
 
-#: ../src/applet.c:1715 ../src/applet.c:2508
+#: ../src/applet.c:1811 ../src/applet.c:2604
 msgid "Networking disabled"
 msgstr "Kát nái máng tát"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1936
+#: ../src/applet.c:2032
 msgid "Enable _Networking"
 msgstr "Bát _máng"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1945
+#: ../src/applet.c:2041
 msgid "Enable _Wireless"
 msgstr "Bát máng _khÃng dÃy"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1954
+#: ../src/applet.c:2050
 msgid "Enable _Mobile Broadband"
 msgstr "Bát _di Äáng bÄng thÃng ráng"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:1963
+#: ../src/applet.c:2059
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Bát di Äáng bÄng thÃng ráng WiMA_X"
 
 #. Toggle notifications item
-#: ../src/applet.c:1974
+#: ../src/applet.c:2070
 msgid "Enable N_otifications"
 msgstr "Bát _thÃng bÃo"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1985
+#: ../src/applet.c:2081
 msgid "Connection _Information"
 msgstr "ThÃng t_in kát nái"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1995
-#| msgid "Edit VPN Connection"
+#: ../src/applet.c:2091
 msgid "Edit Connections..."
 msgstr "Sáa kát nái..."
 
 #. Help item
-#: ../src/applet.c:2009
+#: ../src/applet.c:2105
 msgid "_Help"
 msgstr "Trá _giÃp"
 
 #. About item
-#: ../src/applet.c:2018
+#: ../src/applet.c:2114
 msgid "_About"
 msgstr "_Giái thiáu"
 
-#: ../src/applet.c:2195
+#: ../src/applet.c:2291
 msgid "Disconnected"
 msgstr "Ngát kát nái"
 
-#: ../src/applet.c:2196
+#: ../src/applet.c:2292
 msgid "The network connection has been disconnected."
 msgstr "Kát nái máng ÄÃ bá ngát."
 
-#: ../src/applet.c:2377
+#: ../src/applet.c:2473
 #, c-format
-#| msgid "Wired network connection"
 msgid "Preparing network connection '%s'..."
 msgstr "Äang chuán bá kát nái '%s'..."
 
-#: ../src/applet.c:2380
+#: ../src/applet.c:2476
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Cán xÃc thác cho kát nái '%s'..."
 
-#: ../src/applet.c:2386
+#: ../src/applet.c:2482
 #, c-format
-#| msgid "No network connection"
 msgid "Network connection '%s' active"
 msgstr "Kát nái '%s' ÄÃ hoát Äáng"
 
-#: ../src/applet.c:2464
+#: ../src/applet.c:2560
 #, c-format
-#| msgid "Cannot start VPN connection '%s'"
 msgid "Starting VPN connection '%s'..."
 msgstr "Äang bát Äáu kát nái VPN '%s'..."
 
-#: ../src/applet.c:2467
+#: ../src/applet.c:2563
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Cán xÃc thác cho kát nái VPN '%s'..."
 
-#: ../src/applet.c:2470
+#: ../src/applet.c:2566
 #, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Äang láy Äáa chá VPN cho '%s'..."
 
-#: ../src/applet.c:2473
+#: ../src/applet.c:2569
 #, c-format
-#| msgid "VPN connection to '%s'"
 msgid "VPN connection '%s' active"
 msgstr "Kát nái VPN '%s' ÄÃ hoát Äáng"
 
-#: ../src/applet.c:2512
+#: ../src/applet.c:2608
 msgid "No network connection"
 msgstr "KhÃng cà kát nái máng"
 
-#: ../src/applet.c:3161
+#: ../src/applet.c:3258
 msgid "NetworkManager Applet"
 msgstr "TrÃnh Quán là Máng"
 
@@ -1015,7 +996,6 @@ msgid "_Unlock"
 msgstr "_Bá khoÃ"
 
 #: ../src/info.ui.h:1
-#| msgid "Wired network connection"
 msgid "Active Network Connections"
 msgstr "Kát nái máng hoát Äáng"
 
@@ -1023,45 +1003,19 @@ msgstr "Kát nái máng hoát Äáng"
 msgid "Connection Information"
 msgstr "ThÃng tin kát nái"
 
-#: ../src/wifi.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../src/wifi.ui.h:2
-#| msgid "VPN Connections"
-msgid "Co_nnection:"
-msgstr "_Kát nái:"
-
-#: ../src/wifi.ui.h:3
-msgid "Wireless _adapter:"
-msgstr "_Bá Äiáu háp khÃng dÃy:"
-
-#: ../src/wifi.ui.h:4 ../src/wired-8021x.ui.h:2
-#| msgid "_Network Name:"
-msgid "_Network name:"
-msgstr "TÃ_n máng:"
-
-#: ../src/wifi.ui.h:5
-#| msgid "_Wireless Security:"
-msgid "_Wireless security:"
-msgstr "_An ninh khÃng dÃy:"
-
 #: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-#| msgid "Authentication:"
 msgid "Wired 802.1X authentication"
 msgstr "XÃc thác 802.1X dÃng dÃy"
 
+#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
+msgid "_Network name:"
+msgstr "TÃ_n máng:"
+
 #: ../src/connection-editor/ce-page.c:67
-#| msgid "WPA Automatic"
 msgid "automatic"
 msgstr "tá Äáng"
 
-#: ../src/connection-editor/ce-page.c:294
-#| msgid "Could not start the VPN connection '%s' due to a connection error."
+#: ../src/connection-editor/ce-page.c:305
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "KhÃng thá cáp nhát bà mát kát nái và lái khÃng rÃ."
 
@@ -1099,7 +1053,6 @@ msgstr "Chá _dÃng kát nái nÃy cho tÃi nguyÃn trÃn máng ÄÃ"
 #: ../src/wireless-security/eap-method-tls.ui.h:4
 #: ../src/wireless-security/ws-leap.ui.h:1
 #: ../src/wireless-security/ws-wpa-psk.ui.h:1
-#| msgid "Show password"
 msgid "Sho_w password"
 msgstr "_Hián mát kháu"
 
@@ -1109,7 +1062,6 @@ msgstr "_Hián mát kháu"
 #: ../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:"
 msgid "_Password:"
 msgstr "_Mát kháu:"
 
@@ -1122,13 +1074,11 @@ msgstr "_Dách vá:"
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
 #: ../src/wireless-security/ws-leap.ui.h:3
-#| msgid "User Name:"
 msgid "_Username:"
 msgstr "_TÃn ngÆái dÃng:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#| msgid "IP Address:"
 msgid "Addresses"
 msgstr "Äáa chá"
 
@@ -1136,9 +1086,8 @@ msgstr "Äáa chá"
 #: ../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/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:3
-#| msgid "WPA Automatic"
 msgid "Automatic"
 msgstr "Tá Äáng"
 
@@ -1174,8 +1123,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
 #: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:163
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Thá cÃng"
 
@@ -1185,8 +1134,8 @@ msgstr "Cán ÄÃnh Äáa chá IPv4 cho kát nái Äá hoÃn tát"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:11
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip4.c:187
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Chia sá vái mÃy khÃc"
 
@@ -1209,13 +1158,11 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
-#| msgid "Driver:"
 msgid "_DNS servers:"
 msgstr "MÃy chá _DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
-#| msgid "EAP Method:"
 msgid "_Method:"
 msgstr "_PhÆÆng phÃp:"
 
@@ -1270,7 +1217,6 @@ msgid "Change..."
 msgstr "Thay Äái..."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
-#| msgid "_Network Name:"
 msgid "N_etwork ID:"
 msgstr "_ID máng:"
 
@@ -1291,7 +1237,6 @@ msgid "Prefer 3G (UMTS/HSPA)"
 msgstr "Æu tiÃn 3G (UMTS/HSPA)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
-#| msgid "Show passwords"
 msgid "Sho_w passwords"
 msgstr "_Hián mát kháu"
 
@@ -1301,7 +1246,6 @@ msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:16
 #: ../src/wireless-security/ws-wpa-psk.ui.h:3
-#| msgid "Type:"
 msgid "_Type:"
 msgstr "_Kiáu:"
 
@@ -1318,7 +1262,6 @@ msgid "Allowed methods:"
 msgstr "CÃch cho phÃp:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-#| msgid "Authentication:"
 msgid "Authentication"
 msgstr "XÃc thác"
 
@@ -1355,7 +1298,6 @@ msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_DÃng mà hoà Äiám-Äán-Äiám (MPPE)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:1
-#| msgid "%d Mb/s"
 msgid "1 Gb/s"
 msgstr "1 Gb/giÃy"
 
@@ -1364,12 +1306,10 @@ msgid "10 Gb/s"
 msgstr "10 Gb/giÃy"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:3
-#| msgid "%d Mb/s"
 msgid "10 Mb/s"
 msgstr "10 Mb/giÃy"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:4
-#| msgid "%d Mb/s"
 msgid "100 Mb/s"
 msgstr "100 Mb/giÃy"
 
@@ -1410,41 +1350,29 @@ msgstr ""
 "MAC. VÃ dá: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-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 ""
-"Tuá chán nÃy khoà kát nái nÃy vÃo thiát bá xÃc Äánh bái Äáa chá MAC nháp á "
-"ÄÃy. VÃ dá: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:14
 msgid "Twisted Pair (TP)"
 msgstr "ÄÃi xoán (TP)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_Cloned MAC address:"
 msgstr "Äáa chá MAC _sao:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-#| msgid "Destination Address:"
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Device MAC address:"
 msgstr "Äá_a chá MAC thiát bá:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#| msgid "E_xport"
+#: ../src/connection-editor/ce-page-wired.ui.h:16
 msgid "_Port:"
 msgstr "_Cáng:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#| msgid "Speed:"
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Speed:"
 msgstr "_Tác Äá:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "bytes"
 msgstr "byte"
 
@@ -1477,11 +1405,10 @@ msgid "M_ode:"
 msgstr "_Chá Äá:"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:10
-#| msgid "%d Mb/s"
 msgid "Mb/s"
 msgstr "Mb/giÃy"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 msgid ""
 "This option locks this connection to the wireless access point (AP) "
 "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -1489,33 +1416,31 @@ msgstr ""
 "Tuá chán nÃy khoà kát nái nÃy vÃo Äiám truy cáp (AP) xÃc Äánh bái BSSID nháp "
 "á ÄÃy. VÃ dá: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "NÄng lÆáng _phÃt:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Rate:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "mW"
 msgstr "mW"
 
 #: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-#| msgid "_Wireless Security:"
 msgid "_Security:"
 msgstr "_An ninh:"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#| msgid "Authentication:"
 msgid "Allowed Authentication Methods"
 msgstr "CÃch xÃc thác ÄÆác phÃp"
 
@@ -1554,7 +1479,6 @@ msgid "Password Authentication Protocol"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-#| msgid "PEAP"
 msgid "_EAP"
 msgstr "_EAP"
 
@@ -1563,12 +1487,18 @@ msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-#| msgid "PEAP"
 msgid "_PAP"
 msgstr "_PAP"
 
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-#| msgid "Create VPN Connection"
 msgid "Choose a VPN Connection Type"
 msgstr "Chán loái kát nái VPN"
 
@@ -1585,179 +1515,169 @@ msgstr ""
 "Chán loái VPN bán muán táo kát nái mái. Náu loái VPN nÃy khÃng cà trong danh "
 "sÃch, bán cà lá chÆa cÃi phán bá sung VPN cán thiát."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:505
-#: ../src/connection-editor/ip6-routes-dialog.c:463
-#: ../src/connection-editor/page-ip4.c:733
-#: ../src/connection-editor/page-ip6.c:718
-#| msgid "IP Address:"
+#: ../src/connection-editor/ip4-routes-dialog.c:745
+#: ../src/connection-editor/ip6-routes-dialog.c:687
+#: ../src/connection-editor/page-ip4.c:901
+#: ../src/connection-editor/page-ip6.c:867
 msgid "Address"
 msgstr "Äáa chá"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:521
-#: ../src/connection-editor/page-ip4.c:750
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/page-ip4.c:918
 msgid "Netmask"
 msgstr "Mát ná máng"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:537
-#: ../src/connection-editor/ip6-routes-dialog.c:495
-#: ../src/connection-editor/page-ip4.c:767
-#: ../src/connection-editor/page-ip6.c:752
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip4.c:935
+#: ../src/connection-editor/page-ip6.c:901
 msgid "Gateway"
 msgstr "Cáng"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:553
-#: ../src/connection-editor/ip6-routes-dialog.c:511
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:479
-#: ../src/connection-editor/page-ip6.c:735
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip6.c:884
 msgid "Prefix"
 msgstr "Tián tá"
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:139
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1448
+#: ../src/connection-editor/nm-connection-list.c:1482
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:231
 #, c-format
-#| msgid "VPN connection to '%s'"
 msgid "DSL connection %d"
 msgstr "Kát nái DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
-#| msgid "Automatic (Default)"
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
 msgstr "Tá Äáng (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:127
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (VPN) addresses only"
 msgstr "Tá Äáng (VPN) chá Äáa chá"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-#| msgid "Automatic (Default)"
+#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (PPP)"
 msgstr "Tá Äáng (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (PPP) addresses only"
 msgstr "Tá Äáng (PPP) chá Äáa chá"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
-#| msgid "Automatic (Default)"
+#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Tá Äáng (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:141
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Tá Äáng (PPPoE) chá Äáa chá"
 
-#: ../src/connection-editor/page-ip4.c:137
-#| msgid "Automatic (Default)"
+#: ../src/connection-editor/page-ip4.c:143
 msgid "Automatic (DHCP)"
 msgstr "Tá Äáng (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:144
 msgid "Automatic (DHCP) addresses only"
 msgstr "Tá Äáng (DHCP) chá Äáa chá"
 
-#: ../src/connection-editor/page-ip4.c:175
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Chá Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:191
+#: ../src/connection-editor/page-ip4.c:197
 msgid "Disabled"
 msgstr "Tát"
 
-#: ../src/connection-editor/page-ip4.c:699
+#: ../src/connection-editor/page-ip4.c:832
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Sáa Äánh tuyán IPv4 cho %s"
 
-#: ../src/connection-editor/page-ip4.c:810
+#: ../src/connection-editor/page-ip4.c:982
 msgid "IPv4 Settings"
 msgstr "Thiát láp IPv4"
 
-#: ../src/connection-editor/page-ip4.c:812
+#: ../src/connection-editor/page-ip4.c:984
 msgid "Could not load IPv4 user interface."
 msgstr "KhÃng thá náp giao dián ngÆái dÃng IPv4."
 
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Tá Äáng, chá Äáa chá"
 
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 #: ../src/wireless-security/eap-method.c:285
-#| msgid "none"
 msgid "Ignore"
 msgstr "Bá qua"
 
-#: ../src/connection-editor/page-ip6.c:173
-#| msgid "Automatic (Default)"
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Tá Äáng, chá DHCP"
 
-#: ../src/connection-editor/page-ip6.c:684
+#: ../src/connection-editor/page-ip6.c:798
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Sáa Äánh tuyán IPv6 cho %s"
 
-#: ../src/connection-editor/page-ip6.c:793
+#: ../src/connection-editor/page-ip6.c:946
 msgid "IPv6 Settings"
 msgstr "Thiát láp IPv6"
 
-#: ../src/connection-editor/page-ip6.c:795
+#: ../src/connection-editor/page-ip6.c:948
 msgid "Could not load IPv6 user interface."
 msgstr "KhÃng thá náp giao dián ngÆái dÃng IPv6."
 
-#: ../src/connection-editor/page-mobile.c:374
+#: ../src/connection-editor/page-mobile.c:381
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:398
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:632
+#: ../src/connection-editor/page-mobile.c:639
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:674
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:664
+#: ../src/connection-editor/page-mobile.c:679
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:671
+#: ../src/connection-editor/page-mobile.c:686
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
 #: ../src/connection-editor/page-ppp.c:134
-#| msgid "PEAP"
 msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:232
-#| msgid "PEAP"
+#: ../src/wireless-security/eap-method-ttls.c:230
 msgid "PAP"
 msgstr "PAP"
 
@@ -1767,13 +1687,13 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:248
-#: ../src/wireless-security/eap-method-ttls.c:264
+#: ../src/wireless-security/eap-method-peap.c:246
+#: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/wireless-security/eap-method-ttls.c:247
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -1787,134 +1707,134 @@ msgstr "khÃng cÃ"
 msgid "Editing PPP authentication methods for %s"
 msgstr "Sáa cÃch xÃc thác PPP cho %s"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:283
 msgid "PPP Settings"
 msgstr "Thiát láp PPP"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:285
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:109
 #: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1444
+#: ../src/connection-editor/nm-connection-list.c:1478
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:109
+#: ../src/connection-editor/page-vpn.c:111
 msgid "Could not load VPN user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:124
+#: ../src/connection-editor/page-vpn.c:126
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:218
-#: ../src/connection-editor/nm-connection-list.c:881
+#: ../src/connection-editor/page-vpn.c:201
+#: ../src/connection-editor/nm-connection-list.c:884
 #, c-format
-#| msgid "VPN connection to '%s'"
 msgid "VPN connection %d"
 msgstr "Kát nái VPN %d"
 
-#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/page-wired.c:88
+#: ../src/connection-editor/page-wireless.c:93
+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 ""
+"Tuá chán nÃy khoà kát nái nÃy vÃo thiát bá xÃc Äánh bái Äáa chá MAC nháp á "
+"ÄÃy. VÃ dá: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wired.c:267
 #: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1432
+#: ../src/connection-editor/nm-connection-list.c:1466
 msgid "Wired"
 msgstr "DÃy"
 
-#: ../src/connection-editor/page-wired.c:213
+#: ../src/connection-editor/page-wired.c:269
 msgid "Could not load wired user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:348
+#: ../src/connection-editor/page-wired.c:444
 #, c-format
-#| msgid "Wired network connection"
 msgid "Wired connection %d"
 msgstr "Kát nái máng dÃy %d"
 
-#: ../src/connection-editor/page-wired-security.c:114
+#: ../src/connection-editor/page-wired-security.c:116
 msgid "802.1x Security"
 msgstr "An ninh 802.1x"
 
-#: ../src/connection-editor/page-wired-security.c:116
+#: ../src/connection-editor/page-wired-security.c:118
 msgid "Could not load Wired Security security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:130
+#: ../src/connection-editor/page-wired-security.c:136
 msgid "Use 802.1X security for this connection"
 msgstr "DÃng an ninh 802.1X cho kát nái nÃy"
 
-#: ../src/connection-editor/page-wireless.c:147
-#: ../src/connection-editor/page-wireless.c:151
-#: ../src/connection-editor/page-wireless.c:172
+#: ../src/connection-editor/page-wireless.c:166
+#: ../src/connection-editor/page-wireless.c:170
+#: ../src/connection-editor/page-wireless.c:191
 #, c-format
 msgid "default"
 msgstr "mác Äánh"
 
-#: ../src/connection-editor/page-wireless.c:176
+#: ../src/connection-editor/page-wireless.c:195
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/page-wireless.c:452
 #: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1436
-#| msgid "Enable _Wireless"
+#: ../src/connection-editor/nm-connection-list.c:1470
 msgid "Wireless"
 msgstr "KhÃng dÃy"
 
-#: ../src/connection-editor/page-wireless.c:398
+#: ../src/connection-editor/page-wireless.c:454
 msgid "Could not load WiFi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:562
+#: ../src/connection-editor/page-wireless.c:658
 #, c-format
-#| msgid "Wired network connection"
 msgid "Wireless connection %d"
 msgstr "Kát nái khÃng dÃy %d"
 
 # Name: don't translate / TÃn: Äáng dách
 #: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/wireless-dialog.c:920
-#| msgid "WEP 64/128-bit ASCII"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:923
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Khoà WEP 40/128-bit (Tháp lác phÃn hoác ASCII)"
 
 #: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/wireless-dialog.c:929
+#: ../src/libnm-gtk/nm-wireless-dialog.c:932
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
 #: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/wireless-dialog.c:959
-#| msgid "Dynamic WEP"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:962
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Äáng (802.1x)"
 
 #: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/wireless-dialog.c:973
-#| msgid "WPA2 Personal"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:976
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 CÃ nhÃn"
 
 # Name: don't translate / TÃn: Äáng dách
 #: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/wireless-dialog.c:987
-#| msgid "WPA2 Enterprise"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:990
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kinh doanh"
 
-#: ../src/connection-editor/page-wireless-security.c:359
+#: ../src/connection-editor/page-wireless-security.c:360
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:368
-#| msgid "_Wireless Security:"
+#: ../src/connection-editor/page-wireless-security.c:370
 msgid "Wireless Security"
 msgstr "An ninh khÃng dÃy"
 
-#: ../src/connection-editor/page-wireless-security.c:370
+#: ../src/connection-editor/page-wireless-security.c:372
 msgid "Could not load WiFi security user interface."
 msgstr ""
 
@@ -1924,37 +1844,32 @@ msgid "Editing %s"
 msgstr "Sáa %s"
 
 #: ../src/connection-editor/nm-connection-editor.c:105
-#| msgid "Edit VPN Connection"
 msgid "Editing un-named connection"
 msgstr "Sáa kát nái khÃng tÃn"
 
-#: ../src/connection-editor/nm-connection-editor.c:294
-#| msgid ""
-#| "The NetworkManager Applet could not find some required resources (the "
-#| "glade file was not found)."
+#: ../src/connection-editor/nm-connection-editor.c:288
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:397
-#| msgid "Error displaying connection information:"
+#: ../src/connection-editor/nm-connection-editor.c:391
 msgid "Error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:403
 msgid "_Save"
 msgstr "_LÆu"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:404
 msgid "Save any changes made to this connection."
 msgstr "LÆu nháng thay Äái cáa kát nái nÃy."
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:405
 msgid "_Save..."
 msgstr "_LÆu..."
 
-#: ../src/connection-editor/nm-connection-editor.c:412
+#: ../src/connection-editor/nm-connection-editor.c:406
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
@@ -1963,12 +1878,10 @@ msgid "Available to all users"
 msgstr "Mái ngÆái Äáu dÃng ÄÆác"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
-#| msgid "Connection _Information"
 msgid "Connect _automatically"
 msgstr "Kát nái _tá Äáng"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "Connection _Information"
 msgid "Connection _name:"
 msgstr "_TÃn kát nái:"
 
@@ -1977,7 +1890,6 @@ msgid "E_xport"
 msgstr "_Xuát"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:11
-#| msgid "E_xport"
 msgid "_Import"
 msgstr "_Nháp"
 
@@ -1987,7 +1899,6 @@ msgstr "khÃng bao giá"
 
 #: ../src/connection-editor/nm-connection-list.c:227
 #: ../src/connection-editor/nm-connection-list.c:238
-#| msgid "Unknown"
 msgid "now"
 msgstr "bÃy giá"
 
@@ -2023,12 +1934,10 @@ msgid_plural "%d years ago"
 msgstr[0] "%d nÄm trÆác"
 
 #: ../src/connection-editor/nm-connection-list.c:486
-#| msgid "Connection Established"
 msgid "Connection add failed"
 msgstr "Lái thÃm kát nái"
 
 #: ../src/connection-editor/nm-connection-list.c:515
-#| msgid "Error retrieving VPN connection '%s'"
 msgid "Error saving connection"
 msgstr "Lái lÆu kát nái"
 
@@ -2043,131 +1952,120 @@ msgid "An unknown error occurred."
 msgstr ""
 
 #: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "Error initializing editor"
 msgstr ""
 
 #: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:700
-#: ../src/connection-editor/nm-connection-list.c:867
+#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:870
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
 #: ../src/connection-editor/nm-connection-list.c:557
-#| msgid "Add a new VPN connection"
 msgid "Could not create new connection"
 msgstr "KhÃng thá táo kát nái mái"
 
 #: ../src/connection-editor/nm-connection-list.c:569
-#| msgid "No network connection"
 msgid "Could not edit new connection"
 msgstr "KhÃng thá sáa kát nái mái"
 
-#: ../src/connection-editor/nm-connection-list.c:714
-#| msgid "No network connection"
+#: ../src/connection-editor/nm-connection-list.c:717
 msgid "Could not edit connection"
 msgstr "KhÃng thá sáa kát nái"
 
-#: ../src/connection-editor/nm-connection-list.c:744
-#| msgid "Connection Established"
+#: ../src/connection-editor/nm-connection-list.c:747
 msgid "Connection delete failed"
 msgstr "Lái xoà kát nái"
 
-#: ../src/connection-editor/nm-connection-list.c:776
+#: ../src/connection-editor/nm-connection-list.c:779
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Bán cà chác muán xoà kát nái %s khÃng?"
 
-#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/nm-connection-list.c:914
 #: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "KhÃng thá nháp kát nái VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:913
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:926
-#| msgid "Cannot import VPN connection"
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "Could not edit imported connection"
 msgstr "KhÃng thá sáa kát nái nháp"
 
-#: ../src/connection-editor/nm-connection-list.c:1069
+#: ../src/connection-editor/nm-connection-list.c:1099
 msgid "Name"
 msgstr "TÃn"
 
-#: ../src/connection-editor/nm-connection-list.c:1081
+#: ../src/connection-editor/nm-connection-list.c:1111
 msgid "Last Used"
 msgstr "DÃng lán cuái"
 
-#: ../src/connection-editor/nm-connection-list.c:1197
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "No VPN plugin available. Please install one to enable this button."
 msgstr ""
 "KhÃng cà phán bá sung VPN dÃng ÄÆác. Vui lÃng cÃi Äát hoác bát nÃt nÃy."
 
-#: ../src/connection-editor/nm-connection-list.c:1208
+#: ../src/connection-editor/nm-connection-list.c:1238
 msgid "_Edit"
 msgstr "_Sáa"
 
-#: ../src/connection-editor/nm-connection-list.c:1209
-#| msgid "Edit the selected VPN connection"
+#: ../src/connection-editor/nm-connection-list.c:1239
 msgid "Edit the selected connection"
 msgstr "Sáa kát nái ÄÃ chán"
 
-#: ../src/connection-editor/nm-connection-list.c:1210
+#: ../src/connection-editor/nm-connection-list.c:1240
 msgid "_Edit..."
 msgstr "_Sáa..."
 
-#: ../src/connection-editor/nm-connection-list.c:1211
-#| msgid "Delete the selected VPN connection"
+#: ../src/connection-editor/nm-connection-list.c:1241
 msgid "Authenticate to edit the selected connection"
 msgstr "XÃc thác Äá sáa kát nái ÄÃ chán"
 
-#: ../src/connection-editor/nm-connection-list.c:1226
+#: ../src/connection-editor/nm-connection-list.c:1256
 msgid "_Delete"
 msgstr "_XoÃ"
 
-#: ../src/connection-editor/nm-connection-list.c:1227
-#| msgid "Delete the selected VPN connection"
+#: ../src/connection-editor/nm-connection-list.c:1257
 msgid "Delete the selected connection"
 msgstr "Xoà kát nái Äà chán"
 
-#: ../src/connection-editor/nm-connection-list.c:1228
+#: ../src/connection-editor/nm-connection-list.c:1258
 msgid "_Delete..."
 msgstr "_XoÃ..."
 
-#: ../src/connection-editor/nm-connection-list.c:1229
-#| msgid "Delete the selected VPN connection"
+#: ../src/connection-editor/nm-connection-list.c:1259
 msgid "Authenticate to delete the selected connection"
 msgstr "XÃc thác Äá xÃa kát nái VPN ÄÃ chán"
 
-#: ../src/connection-editor/nm-connection-list.c:1504
-#| msgid "Error retrieving VPN connection '%s'"
+#: ../src/connection-editor/nm-connection-list.c:1538
 msgid "Error creating connection"
 msgstr "Gáp lái táo kát nái"
 
-#: ../src/connection-editor/nm-connection-list.c:1505
+#: ../src/connection-editor/nm-connection-list.c:1539
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "KhÃng biát cÃch táo kát nái '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:1559
-#: ../src/connection-editor/nm-connection-list.c:1571
-#| msgid "Error retrieving VPN connection '%s'"
+#: ../src/connection-editor/nm-connection-list.c:1594
+#: ../src/connection-editor/nm-connection-list.c:1606
 msgid "Error editing connection"
 msgstr "Lái sáa kát nái"
 
-#: ../src/connection-editor/nm-connection-list.c:1560
+#: ../src/connection-editor/nm-connection-list.c:1595
 #, c-format
 msgid "Don't know how to edit '%s' connections"
 msgstr "KhÃng biát cÃch sáa kát nái '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:1572
+#: ../src/connection-editor/nm-connection-list.c:1607
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr ""
@@ -2181,32 +2079,30 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:261
+#: ../src/connection-editor/vpn-helpers.c:262
 msgid "Select file to import"
 msgstr "Chán táp tin cán nháp"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:313
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Táp tin \"%s\" ÄÃ cÃ."
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:315
 msgid "_Replace"
 msgstr "_Thay thá"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:317
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Bán cà muán thay %s vái kát nái VPN bán Äang lÆu khÃng?"
 
-#: ../src/connection-editor/vpn-helpers.c:349
-#| msgid "Cannot import VPN connection"
+#: ../src/connection-editor/vpn-helpers.c:353
 msgid "Cannot export VPN connection"
 msgstr "KhÃng thá xuát kát nái VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:355
 #, c-format
-#| msgid "The VPN connection '%s' was not correctly configured."
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
@@ -2216,219 +2112,114 @@ msgstr ""
 "\n"
 "Lái: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:385
-#| msgid "Edit VPN Connection"
+#: ../src/connection-editor/vpn-helpers.c:390
 msgid "Export VPN connection..."
 msgstr "Xuát kát nái VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:218
+#: ../src/gnome-bluetooth/bt-widget.c:220
 #, c-format
-#| msgid "Delete VPN connection \"%s\"?"
 msgid "Failed to create PAN connection: %s"
 msgstr "Lái táo kát nái PAN: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:223
-#: ../src/gnome-bluetooth/bt-widget.c:491
+#: ../src/gnome-bluetooth/bt-widget.c:225
+#: ../src/gnome-bluetooth/bt-widget.c:493
 msgid "Your phone is now ready to use!"
 msgstr "Äián thoái bán Äà cà thá dÃng!"
 
-#: ../src/gnome-bluetooth/bt-widget.c:247
+#: ../src/gnome-bluetooth/bt-widget.c:249
 #, c-format
-#| msgid "Wireless Network"
-#| msgid_plural "Wireless Networks"
 msgid "%s Network"
 msgstr "Máng %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:373
+#: ../src/gnome-bluetooth/bt-widget.c:375
 #, c-format
 msgid "Error: %s"
 msgstr "Lái: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:486
+#: ../src/gnome-bluetooth/bt-widget.c:488
 #, c-format
-#| msgid "Delete VPN connection \"%s\"?"
 msgid "Failed to create DUN connection: %s"
 msgstr "Lái táo kát nái DUN: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:509
+#: ../src/gnome-bluetooth/bt-widget.c:511
 msgid "Mobile wizard was canceled"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:518
+#: ../src/gnome-bluetooth/bt-widget.c:520
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Loái Äián thoái lá (khÃng phái GSM cÅng nhÆ CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:712
-#: ../src/gnome-bluetooth/bt-widget.c:718
-#| msgid "You are now connected to the wired network."
+#: ../src/gnome-bluetooth/bt-widget.c:714
+#: ../src/gnome-bluetooth/bt-widget.c:720
 msgid "failed to connect to the phone."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:751
+#: ../src/gnome-bluetooth/bt-widget.c:753
 msgid "unexpectedly disconnected from the phone."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:760
+#: ../src/gnome-bluetooth/bt-widget.c:762
 msgid "timed out detecting phone details."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:772
+#: ../src/gnome-bluetooth/bt-widget.c:774
 msgid "Detecting phone configuration..."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:838
+#: ../src/gnome-bluetooth/bt-widget.c:840
 msgid "could not find the Bluetooth device."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:971
+#: ../src/gnome-bluetooth/bt-widget.c:975
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1003
+#: ../src/gnome-bluetooth/bt-widget.c:1007
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1013
+#: ../src/gnome-bluetooth/bt-widget.c:1017
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
+#: ../src/gnome-bluetooth/bt-widget.c:1026
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1085
+#: ../src/gnome-bluetooth/bt-widget.c:1093
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1094
+#: ../src/gnome-bluetooth/bt-widget.c:1102
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr ""
 
-#: ../src/main.c:70
-#| msgid "User Name:"
-msgid "Usage:"
-msgstr "CÃch dÃng:"
-
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (http://projects.gnome.org/";
-"NetworkManager)."
-msgstr ""
-
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
-msgstr ""
-
-#: ../src/mb-menu-item.c:57
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:61
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:63
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:65
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:67
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:69
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:71
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../src/mb-menu-item.c:109
-msgid "not enabled"
-msgstr "chÆa bát"
-
-#: ../src/mb-menu-item.c:115
-msgid "not registered"
-msgstr "chÆa ÄÄng kÃ"
-
-#: ../src/mb-menu-item.c:133
-#, c-format
-#| msgid "Wired Network (%s)"
-msgid "Home network (%s)"
-msgstr "Máng nhà (%s)"
-
-#: ../src/mb-menu-item.c:135
-#, c-format
-#| msgid "_Wired Network"
-msgid "Home network"
-msgstr "Máng nhÃ"
-
-#: ../src/mb-menu-item.c:143
-msgid "searching"
-msgstr "Äang tÃm"
-
-#: ../src/mb-menu-item.c:146
-msgid "registration denied"
-msgstr "ÄÄng kà bá tá chái"
-
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (chuyán vÃng %s)"
-
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (chuyán vÃng)"
-
-#: ../src/mb-menu-item.c:162
-#, c-format
-#| msgid "Wired Network (%s)"
-msgid "Roaming network (%s)"
-msgstr "Máng chuyán vÃng (%s)"
-
-#: ../src/mb-menu-item.c:164
-#, c-format
-#| msgid "_Login to Network"
-msgid "Roaming network"
-msgstr "Máng chuyán vÃng"
-
-#: ../src/utils/mobile-wizard.c:196
+#: ../src/libnm-gtk/nm-mobile-wizard.c:198
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnm-gtk/nm-mobile-wizard.c:205
 msgid "Your Device:"
 msgstr "Thiát bá cáa bán:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:216
 msgid "Your Provider:"
 msgstr "Nhà cung cáp cáa bán:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:227
 msgid "Your Plan:"
 msgstr "GÃi cÆác cáa bán:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2437,23 +2228,23 @@ msgid ""
 "Preferences menu."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../src/libnm-gtk/nm-mobile-wizard.c:264
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnm-gtk/nm-mobile-wizard.c:325
 msgid "Unlisted"
 msgstr "KhÃng liát kÃ"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnm-gtk/nm-mobile-wizard.c:480
 msgid "_Select your plan:"
 msgstr "_Chán gÃi cÆác"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:504
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Access Point Name - TÃn Äiám truy cáp) cáa _gÃi cÆác ÄÆác chán"
 
-#: ../src/utils/mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:528
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2461,182 +2252,269 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:535
 msgid "Choose your Billing Plan"
 msgstr "Chán gÃi cÆác cáa bán"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:583
 msgid "My plan is not listed..."
 msgstr "KhÃng tháy gÃi cÆác cáa tÃi..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../src/libnm-gtk/nm-mobile-wizard.c:740
 msgid "Select your provider from a _list:"
 msgstr "Chán nhà cung cáp tá _danh sÃch:"
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/libnm-gtk/nm-mobile-wizard.c:753
 msgid "Provider"
 msgstr "Nhà cung cáp"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../src/libnm-gtk/nm-mobile-wizard.c:778
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:737
-#| msgid "Driver:"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:789
 msgid "Provider:"
 msgstr "Nhà cung cáp:"
 
-#: ../src/utils/mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:813
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Nhà cung cáp cáa tÃi dÃng cÃng nghá GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:819
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Nhà cung cáp cáa tÃi dÃng cÃng nghá CDMA (1xRTT, EVDO)"
 
-#: ../src/utils/mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:830
 msgid "Choose your Provider"
 msgstr "Chán nhà cung cáp cáa bán"
 
-#: ../src/utils/mobile-wizard.c:1024
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
 msgid "Country or Region List:"
 msgstr "Danh sÃch quác gia hoác lÃnh thá:"
 
-#: ../src/utils/mobile-wizard.c:1036
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
 msgid "Country or region"
 msgstr "Quác gia hoác lÃnh thá:"
 
-#: ../src/utils/mobile-wizard.c:1043
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
 msgid "My country is not listed"
 msgstr "KhÃng tháy cà quác gia cáa tÃi"
 
-#: ../src/utils/mobile-wizard.c:1089
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
 msgid "Choose your Provider's Country or Region"
 msgstr "Chán quác gia hoác lÃnh thá cáa nhà cung cáp"
 
-#: ../src/utils/mobile-wizard.c:1143
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
 msgid "Installed GSM device"
 msgstr "Thiát bá GSM ÄÃ cÃi Äát"
 
-#: ../src/utils/mobile-wizard.c:1146
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
 msgid "Installed CDMA device"
 msgstr "Thiát bá CDMA ÄÃ cÃi Äát"
 
-#: ../src/utils/mobile-wizard.c:1314
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
 msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1330
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
 msgid "Your broadband provider's name"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1336
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
 msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1342
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1369
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
 msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1384
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
 msgid "Any device"
 msgstr "Bát ká thiát bá nÃo"
 
-#: ../src/utils/mobile-wizard.c:1397
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
 msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1561
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
 msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "VÆÆng quác Anh"
-
-#: ../src/utils/nmn-mobile-providers.c:510
-#| msgid "Default Route:"
-msgid "Default"
-msgstr "Mác Äánh"
-
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-#| msgid ""
-#| "The NetworkManager Applet could not find some required resources (the "
-#| "glade file was not found)."
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-
-#: ../src/wireless-dialog.c:454
+#: ../src/libnm-gtk/nm-wireless-dialog.c:457
 msgid "New..."
 msgstr "Mái..."
 
-#: ../src/wireless-dialog.c:1074
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
 msgid "C_reate"
 msgstr "_Táo"
 
-#: ../src/wireless-dialog.c:1152
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
 #, c-format
-#| msgid "You are now connected to the wireless network '%s'."
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr ""
 
-#: ../src/wireless-dialog.c:1154
-#| msgid "Wireless Network Key Required"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
 msgid "Wireless Network Authentication Required"
 msgstr "Cán xÃc thác máng khÃng dÃy"
 
-#: ../src/wireless-dialog.c:1156
-#| msgid "Create new wireless network"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
 msgid "Authentication required by wireless network"
 msgstr "Cán xÃc thác máng khÃng dÃy"
 
-#: ../src/wireless-dialog.c:1161
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
 msgid "Create New Wireless Network"
 msgstr "Táo máng khÃng dÃy mái"
 
-#: ../src/wireless-dialog.c:1163
-#| msgid "Create new wireless network"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
 msgid "New wireless network"
 msgstr "Táo máng khÃng dÃy"
 
-#: ../src/wireless-dialog.c:1164
-#| msgid "Enter the name of the wireless network to which you wish to connect."
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Nháp tÃn máng khÃng dÃy bán muán táo."
 
-#: ../src/wireless-dialog.c:1166
-#| msgid "Connect to Other Wireless Network"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
 msgid "Connect to Hidden Wireless Network"
 msgstr "Kát nái Äán máng khÃng dÃy án"
 
-#: ../src/wireless-dialog.c:1168
-#| msgid "Existing wireless network"
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
 msgid "Hidden wireless network"
 msgstr "án máng khÃng dÃy"
 
-#: ../src/wireless-dialog.c:1169
-#| msgid ""
-#| "Enter the name and security settings of the wireless network you wish to "
-#| "create."
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr "Nnháp tÃn và chi tiát an ninh cáa máng khÃng dÃy án bán muán kát nái."
 
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "Co_nnection:"
+msgstr "_Kát nái:"
+
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "Wireless _adapter:"
+msgstr "_Bá Äiáu háp khÃng dÃy:"
+
+#: ../src/libnm-gtk/wifi.ui.h:5
+msgid "_Wireless security:"
+msgstr "_An ninh khÃng dÃy:"
+
+#: ../src/main.c:73
+msgid "Usage:"
+msgstr "CÃch dÃng:"
+
+#: ../src/main.c:75
+msgid ""
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
+msgstr ""
+
+#: ../src/main.c:76
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+
+#: ../src/mb-menu-item.c:57
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:61
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:63
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:65
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:67
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:69
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:71
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/mb-menu-item.c:109
+msgid "not enabled"
+msgstr "chÆa bát"
+
+#: ../src/mb-menu-item.c:115
+msgid "not registered"
+msgstr "chÆa ÄÄng kÃ"
+
+#: ../src/mb-menu-item.c:133
+#, c-format
+msgid "Home network (%s)"
+msgstr "Máng nhà (%s)"
+
+#: ../src/mb-menu-item.c:135
+#, c-format
+msgid "Home network"
+msgstr "Máng nhÃ"
+
+#: ../src/mb-menu-item.c:143
+msgid "searching"
+msgstr "Äang tÃm"
+
+#: ../src/mb-menu-item.c:146
+msgid "registration denied"
+msgstr "ÄÄng kà bá tá chái"
+
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#, c-format
+msgid "%s (%s roaming)"
+msgstr "%s (chuyán vÃng %s)"
+
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (chuyán vÃng)"
+
+#: ../src/mb-menu-item.c:162
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "Máng chuyán vÃng (%s)"
+
+#: ../src/mb-menu-item.c:164
+#, c-format
+msgid "Roaming network"
+msgstr "Máng chuyán vÃng"
+
+#: ../src/utils/nmn-mobile-providers.c:531
+msgid "Default"
+msgstr "Mác Äánh"
+
+#: ../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 ""
+
 #: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr ""
@@ -2649,20 +2527,19 @@ msgid ""
 msgstr ""
 
 #: ../src/wireless-security/eap-method.c:289
-#| msgid "CA Certificate File:"
 msgid "Choose CA Certificate"
 msgstr "Chán cháng nhán CA"
 
-#: ../src/wireless-security/eap-method.c:627
+#: ../src/wireless-security/eap-method.c:648
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Khoà riÃng DER, PEM, hoác PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:630
+#: ../src/wireless-security/eap-method.c:651
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Cháng nháng DER hoác PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/wireless-security.c:368
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:372
 msgid "MD5"
 msgstr "MD5"
 
@@ -2670,28 +2547,25 @@ msgstr "MD5"
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:349
-#: ../src/wireless-security/eap-method-tls.c:419
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-peap.c:350
+#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
 msgstr ""
 
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 #: ../src/wireless-security/eap-method-ttls.ui.h:2
-#| msgid "Anonymous Identity:"
 msgid "Anony_mous identity:"
 msgstr "Äánh danh _và danh:"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:4
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:3
-#| msgid "CA Certificate File:"
 msgid "C_A certificate:"
 msgstr "_Cháng nhán CA:"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
 #: ../src/wireless-security/eap-method-ttls.ui.h:4
-#| msgid "Authentication:"
 msgid "I_nner authentication:"
 msgstr "XÃc thác _trong:"
 
@@ -2704,7 +2578,6 @@ msgid "Version 1"
 msgstr "PhiÃn bán 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:8
-#| msgid "WPA Personal"
 msgid "_PEAP version:"
 msgstr "PhiÃn bán _PEAP:"
 
@@ -2712,11 +2585,11 @@ msgstr "PhiÃn bán _PEAP:"
 msgid "As_k for this password every time"
 msgstr "_Hái mát kháu mái lán"
 
-#: ../src/wireless-security/eap-method-tls.c:250
+#: ../src/wireless-security/eap-method-tls.c:246
 msgid "Unencrypted private keys are insecure"
 msgstr "Khoà riÃng khÃng mà hoÃ, khÃng an toÃn"
 
-#: ../src/wireless-security/eap-method-tls.c:253
+#: ../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 "
@@ -2725,41 +2598,35 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../src/wireless-security/eap-method-tls.c:410
 msgid "Choose your personal certificate..."
 msgstr "Chán cháng nhán cà nhÃn..."
 
-#: ../src/wireless-security/eap-method-tls.c:425
+#: ../src/wireless-security/eap-method-tls.c:422
 msgid "Choose your private key..."
 msgstr "Chán khoà riÃng..."
 
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#| msgid "Identity:"
 msgid "I_dentity:"
 msgstr "Äá_nh danh:"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:3
-#| msgid "Private Key File:"
 msgid "Private _key:"
 msgstr "_Khoà riÃng:"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:5
-#| msgid "Private Key Password:"
 msgid "_Private key password:"
 msgstr "_Mát kháu khoà riÃng:"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:6
-#| msgid "CA Certificate File:"
 msgid "_User certificate:"
 msgstr "Cháng nhán ngÆái _dÃng:"
 
 #: ../src/wireless-security/nag-user-dialog.ui.h:1
-#| msgid "_Don't remind me again"
 msgid "Don't _warn me again"
 msgstr "Äá_ng cánh bÃo náa"
 
 #: ../src/wireless-security/nag-user-dialog.ui.h:2
-#| msgid "None"
 msgid "No"
 msgstr "KhÃng"
 
@@ -2767,27 +2634,25 @@ msgstr "KhÃng"
 msgid "Yes"
 msgstr "CÃ"
 
-#: ../src/wireless-security/wireless-security.c:380
+#: ../src/wireless-security/wireless-security.c:384
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:404
+#: ../src/wireless-security/wireless-security.c:408
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:415
+#: ../src/wireless-security/wireless-security.c:419
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-#| msgid "Authentication:"
 msgid "_Authentication:"
 msgstr "_XÃc thác:"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-#| msgid "Automatic (Default)"
 msgid "1 (Default)"
 msgstr "1 (mác Äánh)"
 
@@ -2812,7 +2677,6 @@ msgid "Shared Key"
 msgstr "KhÃa dÃng chung"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
-#| msgid "Show key"
 msgid "Sho_w key"
 msgstr "_Hián khoÃ"
 
@@ -2821,10 +2685,12 @@ msgid "WEP inde_x:"
 msgstr "_Chá mác WEP:"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:10
-#| msgid "Key:"
 msgid "_Key:"
 msgstr "_KhÃa:"
 
+#~ msgid "United Kingdom"
+#~ msgstr "VÆÆng quác Anh"
+
 #~ msgid "Passphrase for wireless network %s"
 #~ msgstr "Mát kháu cho máng khÃng dÃy %s"
 



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