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



commit c483c1b1c81ae0d543e8b12b0fd4b58b250478d4
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Jan 29 23:41:10 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  711 ++++++++++++++++++++++++----------------------------------
 po/zh_TW.po |  574 ++++++++++++++++++++----------------------------
 2 files changed, 533 insertions(+), 752 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index f89a40c..0d3547e 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,26 +6,24 @@
 # Chester Cheng <ccheng redhat com>, 2010.
 # Terry Chuang <tchuang redhat com>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-# Roy Chan <roy chan linux org hk>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet 0.9.1\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-09-13 20:32+0000\n"
-"PO-Revision-Date: 2011-09-16 02:33+0800\n"
-"Last-Translator: Roy Chan <roy chan linux org hk>\n"
+"Project-Id-Version: network-manager-applet 0.9.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-29 23:40+0800\n"
+"PO-Revision-Date: 2012-01-29 23:41+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Manage your network connections"
-msgstr "ççæçççéç"
+msgstr "ççäçççéç"
 
 #: ../nm-applet.desktop.in.h:2
 msgid "Network"
@@ -77,7 +75,7 @@ msgstr "çäæåèåæäæèèçåæçæäã"
 
 #: ../nm-connection-editor.desktop.in.h:1
 msgid "Manage and change your network connection settings"
-msgstr "ççèæææçéçèåå"
+msgstr "ççèææäçéçèåå"
 
 #: ../nm-connection-editor.desktop.in.h:2
 #: ../src/connection-editor/nm-connection-editor.ui.h:7
@@ -85,55 +83,55 @@ msgid "Network Connections"
 msgstr "ççéç"
 
 #: ../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-gsm.c:446 ../src/applet-device-wired.c:240
 #: ../src/applet-device-wifi.c:875 ../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:485 ../src/applet-device-wired.c:269
+#: ../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ãã"
+msgstr "äçååéçèã%sãã"
 
 #: ../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
+#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1278 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "ååçéç"
 
 #: ../src/applet-device-bt.c:205
 msgid "You are now connected to the mobile broadband network."
-msgstr "æçååéçèæååéççã"
+msgstr "äçååéçèæååéççã"
 
 #: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
+#: ../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:528 ../src/applet-device-wimax.c:467
+#: ../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:531 ../src/applet-device-wimax.c:470
+#: ../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:534 ../src/applet-device-wimax.c:473
+#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
 #: ../src/applet.c:2479
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "æåèæã%sãæäççäåâ"
 
 #: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet-device-gsm.c:555
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "æååééçã%sãåäçä"
@@ -143,16 +141,16 @@ msgstr "æååééçã%sãåäçä"
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:405
+#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-dialogs.c:430
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "æååé (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
+#: ../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-list.c:1474
+#: ../src/connection-editor/nm-connection-list.c:1490
 msgid "Mobile Broadband"
 msgstr "æååé"
 
@@ -163,15 +161,15 @@ msgstr "æçæååé (CDMA) éçâ"
 
 #: ../src/applet-device-cdma.c:446
 msgid "You are now connected to the CDMA network."
-msgstr "æçååéçè CDMA ççã"
+msgstr "äçååéçè CDMA ççã"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
+#: ../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:550
+#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "æé"
@@ -180,59 +178,64 @@ msgstr "æé"
 msgid "CDMA network."
 msgstr "CDMA ççã"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
 msgid "You are now registered on the home network."
-msgstr "æçååèåèåçççã"
+msgstr "äçååèåèåçççã"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
 msgid "You are now registered on a roaming network."
-msgstr "æçååèåèæéççã"
+msgstr "äçååèåèæéççã"
 
-#: ../src/applet-device-gsm.c:210 ../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"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:456
+#: ../src/applet-device-gsm.c:459
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æçæååé (GSM) éçâ"
 
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet-device-gsm.c:493
 msgid "You are now connected to the GSM network."
-msgstr "æçååéçè GSM ççã"
+msgstr "äçååéçè GSM ççã"
 
-#: ../src/applet-device-gsm.c:651
+#: ../src/applet-device-gsm.c:654
 msgid "PIN code required"
 msgstr "éè PIN ç"
 
-#: ../src/applet-device-gsm.c:659
+#: ../src/applet-device-gsm.c:662
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "éåæååéèçéè PIN ç"
 
-#: ../src/applet-device-gsm.c:784
+#: ../src/applet-device-gsm.c:783
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/applet-device-gsm.c:875
 msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN çéèïèèçæçäæåã"
+msgstr "PIN çéèïèèçäçäæåã"
 
-#: ../src/applet-device-gsm.c:807
+#: ../src/applet-device-gsm.c:898
 msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK çéèïèèçæçäæåã"
+msgstr "PUK çéèïèèçäçäæåã"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:834
+#: ../src/applet-device-gsm.c:925
 msgid "Sending unlock code..."
 msgstr "çéèéççåçâ"
 
-#: ../src/applet-device-gsm.c:897
+#: ../src/applet-device-gsm.c:988
 msgid "SIM PIN unlock required"
 msgstr "éèèé SIM PIN ç"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:989
 msgid "SIM PIN Unlock Required"
 msgstr "éèèé SIM PIN ç"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
+#: ../src/applet-device-gsm.c:991
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -240,25 +243,25 @@ msgid ""
 msgstr "èäçæååéèçã%sãäåïéè SIM PIN çã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
+#: ../src/applet-device-gsm.c:993
 msgid "PIN code:"
 msgstr "PIN çï"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
+#: ../src/applet-device-gsm.c:997
 msgid "Show PIN code"
 msgstr "éç PIN ç"
 
-#: ../src/applet-device-gsm.c:909
+#: ../src/applet-device-gsm.c:1000
 msgid "SIM PUK unlock required"
 msgstr "éèèé SIM PUK ç"
 
-#: ../src/applet-device-gsm.c:910
+#: ../src/applet-device-gsm.c:1001
 msgid "SIM PUK Unlock Required"
 msgstr "éèèé SIM PUK ç"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
+#: ../src/applet-device-gsm.c:1003
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -266,26 +269,26 @@ msgid ""
 msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
+#: ../src/applet-device-gsm.c:1005
 msgid "PUK code:"
 msgstr "PUK çï"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
+#: ../src/applet-device-gsm.c:1008
 msgid "New PIN code:"
 msgstr "æç PIN çï"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
+#: ../src/applet-device-gsm.c:1010
 msgid "Re-enter new PIN code:"
 msgstr "éæèå PIN çï"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
+#: ../src/applet-device-gsm.c:1015
 msgid "Show PIN/PUK codes"
 msgstr "éç PIN/PUK ç"
 
-#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
+#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
 msgid "GSM network."
 msgstr "GSM ççã"
 
@@ -318,7 +321,7 @@ msgstr "åæç"
 
 #: ../src/applet-device-wired.c:274
 msgid "You are now connected to the wired network."
-msgstr "æçååéçèæçççã"
+msgstr "äçååéçèæçççã"
 
 #: ../src/applet-device-wired.c:300
 #, c-format
@@ -392,49 +395,45 @@ msgstr "æåçç"
 msgid "Wireless Networks Available"
 msgstr "åçççççç"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "èæéååçäéçåçççç"
-
-#: ../src/applet-device-wifi.c:1084
+#: ../src/applet-device-wifi.c:1082
 msgid "Use the network menu to connect to a wireless network"
 msgstr "äçççéåäéçåçççç"
 
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
+#: ../src/applet-device-wifi.c:1085 ../src/applet.c:901
 msgid "Don't show this message again"
 msgstr "äèåéçéåèæ"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1277
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "æçååéçåççççã%sãã"
+msgstr "äçååéçåççççã%sãã"
 
-#: ../src/applet-device-wifi.c:1310
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "æåæåççççéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1313
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "æåèåççççéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1316
+#: ../src/applet-device-wifi.c:1314
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "ççççã%sãèæäçèéèâ"
 
-#: ../src/applet-device-wifi.c:1319
+#: ../src/applet-device-wifi.c:1317
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "æåèæççççã%sãæäççäåâ"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1338
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ççççéçã%sãåäçäï %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ççççéçã%sãåäçä"
@@ -458,183 +457,208 @@ msgstr "WiMAX åèçäééåç"
 
 #: ../src/applet-device-wimax.c:428
 msgid "You are now connected to the WiMAX network."
-msgstr "æçååéçè WiMAX ççã"
+msgstr "äçååéçè WiMAX ççã"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "éçéçèèççéèï"
 
-#: ../src/applet-dialogs.c:108
+#: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wireless-security.c:285
 #: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../src/wireless-security/wireless-security.c:397
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "åæ WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c: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/libnm-gtk/nm-wireless-dialog.c:906
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ææ"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:342
+#: ../src/applet-dialogs.c:367
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:344
+#: ../src/applet-dialogs.c:369
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:381
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:416
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "äåçç (%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 "äè"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:442
 msgid "Interface:"
 msgstr "äéï"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:458
 msgid "Hardware Address:"
 msgstr "çääåï"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:466
 msgid "Driver:"
 msgstr "éåçåï"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:495
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:505
 msgid "Security:"
 msgstr "ååæï"
 
-#: ../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 "IP äåï"
 
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
 msgctxt "Address"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:575
 msgid "Broadcast Address:"
 msgstr "åæäåï"
 
 #. Prefix
-#: ../src/applet-dialogs.c:559
+#: ../src/applet-dialogs.c:584
 msgid "Subnet Mask:"
 msgstr "åççéçï"
 
-#: ../src/applet-dialogs.c:561
+#: ../src/applet-dialogs.c:586
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
 msgid "Default Route:"
 msgstr "éèèçï"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:606
 msgid "Primary DNS:"
 msgstr "äè DNSï"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:615
 msgid "Secondary DNS:"
 msgstr "æè DNSï"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:625
 msgid "Ternary DNS:"
 msgstr "çä DNSï"
 
 #. --- 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 "ååç"
 
+#: ../src/applet-dialogs.c:802
+msgid "VPN Type:"
+msgstr "VPN éåï"
+
+#: ../src/applet-dialogs.c:809
+msgid "VPN Gateway:"
+msgstr "VPN ééåï"
+
+#: ../src/applet-dialogs.c:815
+msgid "VPN Username:"
+msgstr "VPN äçèåçï"
+
+#: ../src/applet-dialogs.c:821
+#, fuzzy
+msgid "VPN Banner:"
+msgstr "VPN Banner:"
+
+#: ../src/applet-dialogs.c:827
+msgid "Base Connection:"
+msgstr "åçéçï"
+
+#: ../src/applet-dialogs.c:829
+msgid "Unknown"
+msgstr "äæ"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:892
 msgid "No valid active connections found!"
 msgstr "æäåææçäçäéçï"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:945
 msgid ""
 "Copyright  2004-2011 Red Hat, Inc.\n"
 "Copyright  2005-2008 Novell, Inc.\n"
@@ -644,29 +668,29 @@ msgstr ""
 "Copyright  2005-2008 Novell, Inc.\n"
 "èèååäççèçèèçèè"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:948
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "çäççæçççèçèéççéçåéæçåã"
+msgstr "çäççäçççèçèéççéçåéæçåã"
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:950
 msgid "NetworkManager Website"
 msgstr "NetworkManager çç"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:965
 msgid "Missing resources"
 msgstr "éåèæ"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:990
 msgid "Mobile broadband network password"
 msgstr "æååéççåç"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:999
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "éçèã%sãéèåçã"
 
-#: ../src/applet-dialogs.c:858
+#: ../src/applet-dialogs.c:1018
 msgid "Password:"
 msgstr "åçï"
 
@@ -952,6 +976,10 @@ msgid "NetworkManager Applet"
 msgstr "NetworkManager éæçå"
 
 #: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåèééåèç"
+
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "èé(_U)"
 
@@ -971,11 +999,11 @@ msgstr "æççç 802.1X éè"
 msgid "_Network name:"
 msgstr "ççåç(_N)ï"
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:72
 msgid "automatic"
 msgstr "èå"
 
-#: ../src/connection-editor/ce-page.c:305
+#: ../src/connection-editor/ce-page.c:310
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "çæäæçéèäéçæåçææåæã"
 
@@ -986,7 +1014,7 @@ msgstr "çæäæçéèäéçæåçææåæã"
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
-msgstr "çäåççäååæçéèç IP äåãèæäãæåãæéïåå IP äåã"
+msgstr "çäåççäååäçéèç IP äåãèæäãæåãæéïåå IP äåã"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
@@ -1038,7 +1066,7 @@ msgstr "äçèåç(_U):"
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 msgid "Addresses"
-msgstr "äå"
+msgstr "åå"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1070,9 +1098,7 @@ msgstr "çäèæäæåçççåãèäçéèééäåççå
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
-msgstr ""
-"çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåç"
-"äåã"
+msgstr "çååçäæåç IP äåïçäèæäæåçãèäçéèäåéååçåäæåçäåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
 #: ../src/connection-editor/ce-page-ip6.ui.h:7
@@ -1102,17 +1128,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 çæçè"
-"åïèåæèåã"
+msgstr "DHCP çæçèåèèççäååèäéèäçéçãåæäæèäç DHCP çæçèåïèåæèåã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr ""
-"çéèåäç IPv6 çççæïè IPv4 éçåæïäé IPv6 éçåæåçèïèå"
-"èéçåæã"
+msgstr "çéèåäç IPv6 çççæïè IPv4 éçåæïäé IPv6 éçåæåçèïèåèéçåæã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
@@ -1142,9 +1164,7 @@ msgstr "éè IPv6 addressing æååææéç"
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr ""
-"çéèåäç IPv4 çççæïè IPv6 éçåæïäé IPv4 éçåæåçèïèå"
-"èéçåæã"
+msgstr "çéèåäç IPv4 çççæïè IPv6 éçåæïäé IPv4 éçåæåçèïèåèéçåæã"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "2G (GPRS/EDGE)"
@@ -1302,9 +1322,7 @@ 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"
+msgstr "åéèèåç MAC äåææçéåéçäççççèçççääåãéååèäçç MAC èèæåèãäåï00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
 msgid "Twisted Pair (TP)"
@@ -1369,9 +1387,7 @@ msgstr "Mb/s"
 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"
+msgstr "æééæåæéçéåèåææèåç BSSID ææåççéååéïAPïãäåï00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid "Transmission po_wer:"
@@ -1417,9 +1433,7 @@ msgstr "ååäçéèéèåå"
 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 äæåæææææçéèææãåæéçåæïè"
-"åèåçæäææçææã"
+msgstr "åååæææäïççäæèç PPP äæåæææææçéèææãåæéçåæïèåèåçæäææçææã"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "MSCHAP v_2"
@@ -1450,6 +1464,7 @@ 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-fast.ui.h:1
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:1
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:1
@@ -1470,16 +1485,14 @@ 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 åæçåã"
+msgstr "éæäæèçåæéçäç VPN éåãåæäæèåçç VPN éçéåææåçåæåäïåèæææåèæçç VPN åæçåã"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:745
 #: ../src/connection-editor/ip6-routes-dialog.c:687
 #: ../src/connection-editor/page-ip4.c:901
 #: ../src/connection-editor/page-ip6.c:867
 msgid "Address"
-msgstr "äå"
+msgstr "åå"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:762
 #: ../src/connection-editor/page-ip4.c:918
@@ -1505,7 +1518,7 @@ msgstr "åç"
 
 #: ../src/connection-editor/page-dsl.c:139
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1482
+#: ../src/connection-editor/nm-connection-list.c:1498
 msgid "DSL"
 msgstr "DSL"
 
@@ -1621,7 +1634,7 @@ msgstr "éææååéäæåéå"
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
-msgstr "èéææçççåéäæåæäççæèãåææäçåïèæèäæåã"
+msgstr "èéæäçççåéäæåæäççæèãåæääçåïèæèäæåã"
 
 #: ../src/connection-editor/page-mobile.c:679
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
@@ -1646,6 +1659,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-fast.c:277
 #: ../src/wireless-security/eap-method-peap.c:246
 #: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
@@ -1659,7 +1673,7 @@ msgstr "MSCHAP"
 #. Translators: "none" refers to authentication methods
 #: ../src/connection-editor/page-ppp.c:141
 msgid "none"
-msgstr "ç"
+msgstr "ææ"
 
 #: ../src/connection-editor/page-ppp.c:201
 #, c-format
@@ -1676,7 +1690,7 @@ msgstr "çæèå PPP äçèäéã"
 
 #: ../src/connection-editor/page-vpn.c:109
 #: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
+#: ../src/connection-editor/nm-connection-list.c:1494
 msgid "VPN"
 msgstr "VPN"
 
@@ -1690,7 +1704,7 @@ msgid "Could not find VPN plugin service for '%s'."
 msgstr "æäåã%sãç VPN åæçåæåã"
 
 #: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/nm-connection-list.c:900
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN éç %d"
@@ -1700,13 +1714,11 @@ msgstr "VPN éç %d"
 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"
+msgstr "æééæåæéçéåèåææèåç MAC äåææåçççèçãäåï00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-wired.c:267
 #: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
+#: ../src/connection-editor/nm-connection-list.c:1482
 msgid "Wired"
 msgstr "æç"
 
@@ -1745,7 +1757,7 @@ msgstr "%u (%u MHz)"
 
 #: ../src/connection-editor/page-wireless.c:452
 #: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
+#: ../src/connection-editor/nm-connection-list.c:1486
 msgid "Wireless"
 msgstr "çççç"
 
@@ -1904,18 +1916,18 @@ msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "åæã%sã/ã%sãæçæçï%d"
 
 #: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
+#: ../src/connection-editor/nm-connection-list.c:662
 msgid "An unknown error occurred."
 msgstr "ççäæçéèã"
 
 #: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "Error initializing editor"
 msgstr "åååçèåæççéè"
 
 #: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
+#: ../src/connection-editor/nm-connection-list.c:719
+#: ../src/connection-editor/nm-connection-list.c:886
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1929,25 +1941,25 @@ msgstr "çæåçæéç"
 msgid "Could not edit new connection"
 msgstr "çæçèæéç"
 
-#: ../src/connection-editor/nm-connection-list.c:717
+#: ../src/connection-editor/nm-connection-list.c:733
 msgid "Could not edit connection"
 msgstr "çæçèéç"
 
-#: ../src/connection-editor/nm-connection-list.c:747
+#: ../src/connection-editor/nm-connection-list.c:763
 msgid "Connection delete failed"
 msgstr "åééçåæ"
 
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/nm-connection-list.c:795
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
-msgstr "æçåèåééç %s ï"
+msgstr "äçåèåééç %s ï"
 
-#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:930
 #: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "çæåå VPN ççéç"
 
-#: ../src/connection-editor/nm-connection-list.c:916
+#: ../src/connection-editor/nm-connection-list.c:932
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1957,74 +1969,74 @@ msgstr ""
 "\n"
 "éèïææ VPN æåéåã"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:945
 msgid "Could not edit imported connection"
 msgstr "çæçèååçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1099
+#: ../src/connection-editor/nm-connection-list.c:1115
 msgid "Name"
 msgstr "åç"
 
-#: ../src/connection-editor/nm-connection-list.c:1111
+#: ../src/connection-editor/nm-connection-list.c:1127
 msgid "Last Used"
 msgstr "æåäçç"
 
-#: ../src/connection-editor/nm-connection-list.c:1227
+#: ../src/connection-editor/nm-connection-list.c:1243
 msgid "No VPN plugin available. Please install one to enable this button."
 msgstr "ææ VPN åæçååçãèåèåääçäåçéåæéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1238
+#: ../src/connection-editor/nm-connection-list.c:1254
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1239
+#: ../src/connection-editor/nm-connection-list.c:1255
 msgid "Edit the selected connection"
 msgstr "çèéåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1240
+#: ../src/connection-editor/nm-connection-list.c:1256
 msgid "_Edit..."
 msgstr "çè(_E)â"
 
-#: ../src/connection-editor/nm-connection-list.c:1241
+#: ../src/connection-editor/nm-connection-list.c:1257
 msgid "Authenticate to edit the selected connection"
 msgstr "éèäçèéåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1256
+#: ../src/connection-editor/nm-connection-list.c:1272
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1257
+#: ../src/connection-editor/nm-connection-list.c:1273
 msgid "Delete the selected connection"
 msgstr "åééåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1258
+#: ../src/connection-editor/nm-connection-list.c:1274
 msgid "_Delete..."
 msgstr "åé(_D)â"
 
-#: ../src/connection-editor/nm-connection-list.c:1259
+#: ../src/connection-editor/nm-connection-list.c:1275
 msgid "Authenticate to delete the selected connection"
 msgstr "éèäåééåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1538
+#: ../src/connection-editor/nm-connection-list.c:1554
 msgid "Error creating connection"
 msgstr "åçéçæççéè"
 
-#: ../src/connection-editor/nm-connection-list.c:1539
+#: ../src/connection-editor/nm-connection-list.c:1555
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "äçéåäåçã%sãéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
+#: ../src/connection-editor/nm-connection-list.c:1610
+#: ../src/connection-editor/nm-connection-list.c:1622
 msgid "Error editing connection"
 msgstr "çèéçæççéè"
 
-#: ../src/connection-editor/nm-connection-list.c:1595
+#: ../src/connection-editor/nm-connection-list.c:1611
 #, c-format
 msgid "Don't know how to edit '%s' connections"
 msgstr "äçéåäçèã%sãéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1607
+#: ../src/connection-editor/nm-connection-list.c:1623
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "æäå UUIDã%sãçéç"
@@ -2041,29 +2053,29 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:261
+#: ../src/connection-editor/vpn-helpers.c:262
 msgid "Select file to import"
 msgstr "éæèååçææ"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:313
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "åçã%sãçææåçååã"
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:315
 msgid "_Replace"
 msgstr "åä(_R)"
 
-#: ../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 "ææåèäæåååç VPN éçåä %sï"
+msgstr "äæåèäæåååç VPN éçåä %sï"
 
-#: ../src/connection-editor/vpn-helpers.c:349
+#: ../src/connection-editor/vpn-helpers.c:353
 msgid "Cannot export VPN connection"
 msgstr "äèåå VPN éç"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:355
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2074,7 +2086,7 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:390
 msgid "Export VPN connection..."
 msgstr "åå VPN éçâ"
 
@@ -2086,7 +2098,7 @@ msgstr "çæåç PAN éçï%s"
 #: ../src/gnome-bluetooth/bt-widget.c:225
 #: ../src/gnome-bluetooth/bt-widget.c:493
 msgid "Your phone is now ready to use!"
-msgstr "æçéèçååçåääçï"
+msgstr "äçéèçååçåääçï"
 
 #: ../src/gnome-bluetooth/bt-widget.c:249
 #, c-format
@@ -2105,7 +2117,7 @@ msgstr "çæåç DUN éçï%s"
 
 #: ../src/gnome-bluetooth/bt-widget.c:511
 msgid "Mobile wizard was canceled"
-msgstr "æåçéåçåæ"
+msgstr "èåçéåçåæ"
 
 #: ../src/gnome-bluetooth/bt-widget.c:520
 msgid "Unknown phone device type (not GSM or CDMA)"
@@ -2132,54 +2144,54 @@ msgstr "åæéèçéçâ"
 msgid "could not find the Bluetooth device."
 msgstr "æäåèçèçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/gnome-bluetooth/bt-widget.c:980
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "éèçèçéæååéåèåæèççéçååçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1007
+#: ../src/gnome-bluetooth/bt-widget.c:1012
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr "çæéèèççéçïçæéè D-Busï%sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1017
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
+#: ../src/gnome-bluetooth/bt-widget.c:1031
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
+#: ../src/gnome-bluetooth/bt-widget.c:1098
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "äçææäçççèçïPAN/NAPï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
+#: ../src/gnome-bluetooth/bt-widget.c:1107
 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:"
-msgstr "æååéçåçéçäääèåï"
+msgstr "èååéçåçéçäääèåï"
 
 #. Device
 #: ../src/libnm-gtk/nm-mobile-wizard.c:205
 msgid "Your Device:"
-msgstr "æçèç:"
+msgstr "äçèç:"
 
 #. Provider
 #: ../src/libnm-gtk/nm-mobile-wizard.c:216
 msgid "Your Provider:"
-msgstr "æçäæå:"
+msgstr "äçäæå:"
 
 #. Plan and APN
 #: ../src/libnm-gtk/nm-mobile-wizard.c:227
 msgid "Your Plan:"
-msgstr "æçèå:"
+msgstr "äçèå:"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:252
 msgid ""
@@ -2188,10 +2200,7 @@ msgid ""
 "resources, double-check your settings.  To modify your mobile broadband "
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
-msgstr ""
-"çåïææææéåçèåïéèåéäæçæååéäæåãåæéçåæïæææ"
-"çæååççèæïèææèåãèäææååééççèåïèåãççã >> ãå"
-"åèåãäïéæãççéçãã"
+msgstr "çåïææäæéåçèåïéèåéääçæååéäæåãåæéçåæïææäçæååççèæïèææèåãèäææååééççèåïèåãççã >> ãååèåãäïéæãççéçãã"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:264
 msgid "Confirm Mobile Broadband Settings"
@@ -2203,7 +2212,7 @@ msgstr "æååç"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:480
 msgid "_Select your plan:"
-msgstr "éææçèå(_S)ï"
+msgstr "éæäçèå(_S)ï"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:504
 msgid "Selected plan _APN (Access Point Name):"
@@ -2216,13 +2225,13 @@ msgid ""
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
-"èåïéæäæççèååèæåèåéåèçæèçèïæèæçæéçã\n"
+"èåïéæäæççèååèæåèåéåèçæèçèïæèäçæéçã\n"
 "\n"
-"åææäçåæäççèåïèæèäæåïäåçèåç APN çäã"
+"åæääçåæäççèåïèæèäæåïäåçèåç APN çäã"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:535
 msgid "Choose your Billing Plan"
-msgstr "éææçèèèå"
+msgstr "éæäçèèèå"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:583
 msgid "My plan is not listed..."
@@ -2254,7 +2263,7 @@ msgstr "æçäæåäç CDMA æèï1xRTTãEVDOï"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:830
 msgid "Choose your Provider"
-msgstr "éææçäæå"
+msgstr "éæäçäæå"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1080
 msgid "Country or Region List:"
@@ -2270,7 +2279,7 @@ msgstr "æçååäææååä"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1145
 msgid "Choose your Provider's Country or Region"
-msgstr "éææçäæåçååæåå"
+msgstr "éæäçäæåçååæåå"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1199
 msgid "Installed GSM device"
@@ -2284,11 +2293,11 @@ msgstr "ååèç CDMA èç"
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
-msgstr "éèååæèæåèåæååééçïéèææï3Gïççã"
+msgstr "éèååäèæåèåæååééçïéèææï3Gïççã"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1379
 msgid "You will need the following information:"
-msgstr "æéèääèèï"
+msgstr "äéèääèèï"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1394
 msgid "Your broadband provider's name"
@@ -2300,7 +2309,7 @@ msgstr "åéèèèåçåç"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1406
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "ïåæäææäïæçåéèèèåç APNïååéåçï"
+msgstr "ïåæäææäïäçåéèèèåç APNïååéåçï"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1433
 msgid "Create a connection for _this mobile broadband device:"
@@ -2329,8 +2338,8 @@ msgstr "åç(_R)"
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1161
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "éèåçææåååçåäååççççã%sãã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1163
@@ -2351,7 +2360,7 @@ msgstr "æççççç"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1173
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "èåæèåçççççççåçã"
+msgstr "èåäèåçççççççåçã"
 
 #: ../src/libnm-gtk/nm-wireless-dialog.c:1175
 msgid "Connect to Hidden Wireless Network"
@@ -2365,7 +2374,7 @@ msgstr "éèççççç"
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
-msgstr "èåæèéæçéèçççççåçèååæèçèæã"
+msgstr "èåäèéæçéèçççççåçèååæèçèæã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Co_nnection:"
@@ -2387,8 +2396,7 @@ msgstr "çæ:"
 msgid ""
 "This program is a component of NetworkManager (http://projects.gnome.org/";
 "NetworkManager)."
-msgstr ""
-"æçåæ NetworkManagerïhttp://projects.gnome.org/NetworkManagerïçåä";
+msgstr "æçåæ NetworkManagerïhttp://projects.gnome.org/NetworkManagerïçåä";
 
 #: ../src/main.c:76
 msgid ""
@@ -2493,9 +2501,7 @@ 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) çèææéæéçäååãææçççç(åèèçåãåèä"
-"æ)ãæåèéæäåèæäåçèæï"
+msgstr "ääçèæäå (CA) çèææéæéçäååãææçççç(åèèçåãåèäæ)ãæåèéæäåèæäåçèæï"
 
 #: ../src/wireless-security/eap-method.c:289
 msgid "Choose CA Certificate"
@@ -2509,37 +2515,72 @@ msgstr "DER, PEM, æ PKCS#12 çååçå(*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ PEM èæ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: ../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:3
+msgid "Anonymous"
+msgstr "åå"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+msgid "Authenticated"
+msgstr "åéè"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:5
+msgid "Both"
+msgstr "åè"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "åééè(_N):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+msgid "_Allow automatic PAC provisioning"
+msgstr "åèèåäæ P_AC"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "_PAC file:"
+msgstr "_PAC ææï"
+
+#: ../src/wireless-security/eap-method-fast.c:261
 #: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
+#: ../src/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "éæäå PAC ææâ"
+
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC ææ (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr "ææææ"
+
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:373
+msgid "MD5"
+msgstr "MD5"
+
 #: ../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 "éæèæææåä(CA)èæâ"
 
-#: ../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-peap.ui.h:4
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "C_A certificate:"
 msgstr "CA èæ(_A)ï"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
-msgstr "åééè(_N):"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "Version 0"
 msgstr "çæ 0"
@@ -2568,18 +2609,17 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"æéæççååçåääææåçäèã éåèæåèäååçåæãèéæçåçä"
-"èççååçåã\n"
+"æéæççååçåääææåçäèã éåèæåèäååçåæãèéæçåçäèççååçåã\n"
 "\n"
-"ïæåääç openssl äååæççååçåï"
+"ïäåääç openssl äååäççååçåï"
 
 #: ../src/wireless-security/eap-method-tls.c:410
 msgid "Choose your personal certificate..."
-msgstr "éææçåäèæâ"
+msgstr "éæäçåäèæâ"
 
 #: ../src/wireless-security/eap-method-tls.c:422
 msgid "Choose your private key..."
-msgstr "éææççååçåâ"
+msgstr "éæäççååçåâ"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:2
 msgid "I_dentity:"
@@ -2609,15 +2649,19 @@ msgstr "å"
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:385
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:409
+msgid "FAST"
+msgstr "å"
+
+#: ../src/wireless-security/wireless-security.c:420
 msgid "Tunneled TLS"
 msgstr "çéå TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:431
 msgid "Protected EAP (PEAP)"
 msgstr "äèå EAP (PEAP)"
 
@@ -2662,170 +2706,3 @@ msgstr "WEP çå(_X):"
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "_Key:"
 msgstr "åçå(_K)ï"
-
-#~ msgid "United Kingdom"
-#~ msgstr "èå"
-
-#~ msgid "C_onnect"
-#~ msgstr "éç(_O)"
-
-#~ msgid "Other Wireless Network..."
-#~ msgstr "åäççççâ"
-
-#~ msgid "label"
-#~ msgstr "æç"
-
-#~ msgid "Network Manager"
-#~ msgstr "ççççå"
-
-#~ msgid "An instance of nm-applet is already running.\n"
-#~ msgstr "nm-applet æååèäã\n"
-
-#~ msgid "Could not acquire the %s service. (%d)\n"
-#~ msgstr "çæåå %s æåã(%d)\n"
-
-#~ msgid "could not connect to the system bus."
-#~ msgstr "çæéçèççåææã"
-
-#~ msgid "Cannot start VPN connection '%s'"
-#~ msgstr "çæåè VPN éçâ%sâ"
-
-#~ msgid ""
-#~ "Could not find the authentication dialog for VPN connection type '%s'. "
-#~ "Contact your system administrator."
-#~ msgstr "æäå VPN éçéåã%sãçéèåèçãèéçæçççççåã"
-
-#~ msgid ""
-#~ "There was a problem launching the authentication dialog for VPN "
-#~ "connection type '%s'. Contact your system administrator."
-#~ msgstr "åè VPN éçéåã%sãçéèåèçççåéãèéçæçççççåã"
-
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "ååçèæääæèïèéäåéåéäç\n"
-#~ "ääååïGNOME çèåéæåååèæï\n"
-#~ "community linuxhall org\n"
-#~ "\n"
-#~ "Hialan Liu <hialan liu gmail com>, 2008.\n"
-#~ "Woodman Tuen <wmtuen gmail com>, 2005."
-
-#~ msgid ""
-#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-#~ msgstr "<span size=\"larger\" weight=\"bold\">äçäçççéç</span>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Version 0\n"
-#~ "Version 1"
-#~ msgstr ""
-#~ "èå\n"
-#~ "ç 0 ç\n"
-#~ "ç 1 ç"
-
-#~ msgid "<b>Addresses</b>"
-#~ msgstr "<b>äå</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Automatic with manual DNS settings\n"
-#~ "Manual\n"
-#~ "Link-Local\n"
-#~ "Shared to other computers"
-#~ msgstr ""
-#~ "èå\n"
-#~ "èåäæåèå DNS èåå\n"
-#~ "æåçéç\n"
-#~ "åäçåäéè"
-
-#~ msgid "<b>Basic</b>"
-#~ msgstr "<b>åæ</b>"
-
-#~ msgid ""
-#~ "Any\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "Prefer 3G (UMTS/HSPA)\n"
-#~ "Prefer 2G (GPRS/EDGE)"
-#~ msgstr ""
-#~ "ää\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "åå 3G (UMTS/HSPA)\n"
-#~ "åå 2G (GPRS/EDGE)"
-
-#~ msgid "<b>Authentication</b>"
-#~ msgstr "<b>éè</b>"
-
-#~ msgid "<b>Echo</b>"
-#~ msgstr "<b>åé</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-#~ msgstr ""
-#~ "èå\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Twisted Pair (TP)\n"
-#~ "Attachment Unit Interface (AUI)\n"
-#~ "BNC\n"
-#~ "Media Independent Interface (MII)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "éçç (TP)\n"
-#~ "æèååäé (AUI)\n"
-#~ "BNC\n"
-#~ "åäçéäé (MII)"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-
-#~ msgid ""
-#~ "The connection editor could not find some required resources (the "
-#~ "NetworkManager applet glade file was not found)."
-#~ msgstr ""
-#~ "éççèåçææåääéèçèæïæäå NetworkManager éæçå glade "
-#~ "æï"
-
-#~ msgid "Country"
-#~ msgstr "åå"
-
-#~ msgid "PUK code required"
-#~ msgstr "éè PUK ç"
-
-#~ msgid "PUK code is needed for the mobile broadband device"
-#~ msgstr "éåæååéèçéè PUK ç"
-
-#~ msgctxt "No wired security used"
-#~ msgid "None"
-#~ msgstr "ç"
-
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
-#~ msgid "Unknown"
-#~ msgstr "äæ"
-
-#~ msgid "_Routes&#x2026;"
-#~ msgstr "èç&#x2026;(_R)"
-
-#~ msgid "Apply"
-#~ msgstr "åç"
-
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "ååéåéççæéèäçææäçèã"
-
-#~ msgid "Apply..."
-#~ msgstr "åçâ"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0297eef..29b599a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,11 +9,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet 0.9.1\n"
+"Project-Id-Version: network-manager-applet 0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-18 08:36+0800\n"
-"PO-Revision-Date: 2011-09-15 21:49+0800\n"
-"Last-Translator: Roy Chan <roy chan linux org hk>\n"
+"POT-Creation-Date: 2012-01-29 23:40+0800\n"
+"PO-Revision-Date: 2012-01-29 11:14+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"
 "MIME-Version: 1.0\n"
@@ -83,21 +83,21 @@ msgid "Network Connections"
 msgstr "çèéç"
 
 #: ../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-gsm.c:446 ../src/applet-device-wired.c:240
 #: ../src/applet-device-wifi.c:875 ../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:485 ../src/applet-device-wired.c:269
+#: ../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:489 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1278 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "ååçéç"
 
@@ -106,32 +106,32 @@ 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:525 ../src/applet-device-wimax.c:464
+#: ../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:528 ../src/applet-device-wimax.c:467
+#: ../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:531 ../src/applet-device-wimax.c:470
+#: ../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:534 ../src/applet-device-wimax.c:473
+#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
 #: ../src/applet.c:2479
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "æåèæã%sãæäçèäåâ"
 
 #: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet-device-gsm.c:555
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "èååééçã%sãåäçä"
@@ -141,16 +141,16 @@ msgstr "èååééçã%sãåäçä"
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:405
+#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-dialogs.c:430
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "èååé (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
+#: ../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-list.c:1474
+#: ../src/connection-editor/nm-connection-list.c:1490
 msgid "Mobile Broadband"
 msgstr "èååé"
 
@@ -163,13 +163,13 @@ msgstr "æçèååé (CDMA) éçâ"
 msgid "You are now connected to the CDMA network."
 msgstr "æçååéçè CDMA çèã"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
+#: ../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:550
+#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "æé"
@@ -178,59 +178,64 @@ msgstr "æé"
 msgid "CDMA network."
 msgstr "CDMA çèã"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
+#: ../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:1104
+#: ../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:210 ../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"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:456
+#: ../src/applet-device-gsm.c:459
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æçèååé (GSM) éçâ"
 
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet-device-gsm.c:493
 msgid "You are now connected to the GSM network."
 msgstr "æçååéçè GSM çèã"
 
-#: ../src/applet-device-gsm.c:651
+#: ../src/applet-device-gsm.c:654
 msgid "PIN code required"
 msgstr "éè PIN ç"
 
-#: ../src/applet-device-gsm.c:659
+#: ../src/applet-device-gsm.c:662
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "éåèååéèçéè PIN ç"
 
-#: ../src/applet-device-gsm.c:784
+#: ../src/applet-device-gsm.c:783
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/applet-device-gsm.c:875
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN çéèïèèçæçäæåã"
 
-#: ../src/applet-device-gsm.c:807
+#: ../src/applet-device-gsm.c:898
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK çéèïèèçæçäæåã"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:834
+#: ../src/applet-device-gsm.c:925
 msgid "Sending unlock code..."
 msgstr "çéèéççåçâ"
 
-#: ../src/applet-device-gsm.c:897
+#: ../src/applet-device-gsm.c:988
 msgid "SIM PIN unlock required"
 msgstr "éèèé SIM PIN ç"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:989
 msgid "SIM PIN Unlock Required"
 msgstr "éèèé SIM PIN ç"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
+#: ../src/applet-device-gsm.c:991
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -238,25 +243,25 @@ msgid ""
 msgstr "èäçèååéèçã%sãäåïéè SIM PIN çã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
+#: ../src/applet-device-gsm.c:993
 msgid "PIN code:"
 msgstr "PIN çï"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
+#: ../src/applet-device-gsm.c:997
 msgid "Show PIN code"
 msgstr "éç PIN ç"
 
-#: ../src/applet-device-gsm.c:909
+#: ../src/applet-device-gsm.c:1000
 msgid "SIM PUK unlock required"
 msgstr "éèèé SIM PUK ç"
 
-#: ../src/applet-device-gsm.c:910
+#: ../src/applet-device-gsm.c:1001
 msgid "SIM PUK Unlock Required"
 msgstr "éèèé SIM PUK ç"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
+#: ../src/applet-device-gsm.c:1003
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -264,26 +269,26 @@ msgid ""
 msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
+#: ../src/applet-device-gsm.c:1005
 msgid "PUK code:"
 msgstr "PUK çï"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
+#: ../src/applet-device-gsm.c:1008
 msgid "New PIN code:"
 msgstr "æç PIN çï"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
+#: ../src/applet-device-gsm.c:1010
 msgid "Re-enter new PIN code:"
 msgstr "éæèå PIN çï"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
+#: ../src/applet-device-gsm.c:1015
 msgid "Show PIN/PUK codes"
 msgstr "éç PIN/PUK ç"
 
-#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
+#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
 msgid "GSM network."
 msgstr "GSM çèã"
 
@@ -390,49 +395,45 @@ msgstr "æåçè"
 msgid "Wireless Networks Available"
 msgstr "åçççççè"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "èæéååçäéçåçççè"
-
-#: ../src/applet-device-wifi.c:1084
+#: ../src/applet-device-wifi.c:1082
 msgid "Use the network menu to connect to a wireless network"
 msgstr "äççèéåäéçåçççè"
 
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
+#: ../src/applet-device-wifi.c:1085 ../src/applet.c:901
 msgid "Don't show this message again"
 msgstr "äèåéçéåèæ"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1277
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "æçååéçåçççèã%sãã"
 
-#: ../src/applet-device-wifi.c:1310
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "æåæåçççèéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1313
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "æåèåçççèéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1316
+#: ../src/applet-device-wifi.c:1314
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "çççèã%sãèæäçèéèâ"
 
-#: ../src/applet-device-wifi.c:1319
+#: ../src/applet-device-wifi.c:1317
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "æåèæçççèã%sãæäçèäåâ"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1338
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "çççèéçã%sãåäçäï %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "çççèéçã%sãåäçä"
@@ -458,181 +459,206 @@ msgstr "WiMAX åèçéééåç"
 msgid "You are now connected to the WiMAX network."
 msgstr "æçååéçè WiMAX çèã"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "éçéçèèççéèï"
 
-#: ../src/applet-dialogs.c:108
+#: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wireless-security.c:285
 #: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../src/wireless-security/wireless-security.c:397
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "åæ WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c: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/libnm-gtk/nm-wireless-dialog.c:906
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ææ"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:342
+#: ../src/applet-dialogs.c:367
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:344
+#: ../src/applet-dialogs.c:369
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:381
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:416
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "äåçè (%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 "äè"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:442
 msgid "Interface:"
 msgstr "äéï"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:458
 msgid "Hardware Address:"
 msgstr "çéäåï"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:466
 msgid "Driver:"
 msgstr "éåçåï"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:495
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:505
 msgid "Security:"
 msgstr "ååæï"
 
-#: ../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 "IP äåï"
 
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
 msgctxt "Address"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:575
 msgid "Broadcast Address:"
 msgstr "åæäåï"
 
 #. Prefix
-#: ../src/applet-dialogs.c:559
+#: ../src/applet-dialogs.c:584
 msgid "Subnet Mask:"
 msgstr "åçèéçï"
 
-#: ../src/applet-dialogs.c:561
+#: ../src/applet-dialogs.c:586
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
 msgid "Default Route:"
 msgstr "éèèçï"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:606
 msgid "Primary DNS:"
 msgstr "äè DNSï"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:615
 msgid "Secondary DNS:"
 msgstr "æè DNSï"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:625
 msgid "Ternary DNS:"
 msgstr "çä DNSï"
 
 #. --- 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 "ååç"
 
+#: ../src/applet-dialogs.c:802
+msgid "VPN Type:"
+msgstr "VPN éåï"
+
+#: ../src/applet-dialogs.c:809
+msgid "VPN Gateway:"
+msgstr "VPN ééåï"
+
+#: ../src/applet-dialogs.c:815
+msgid "VPN Username:"
+msgstr "VPN äçèåçï"
+
+#: ../src/applet-dialogs.c:821
+#, fuzzy
+msgid "VPN Banner:"
+msgstr "VPN Banner:"
+
+#: ../src/applet-dialogs.c:827
+msgid "Base Connection:"
+msgstr "åçéçï"
+
+#: ../src/applet-dialogs.c:829
+msgid "Unknown"
+msgstr "äæ"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:892
 msgid "No valid active connections found!"
 msgstr "æäåææçäçäéçï"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:945
 msgid ""
 "Copyright  2004-2011 Red Hat, Inc.\n"
 "Copyright  2005-2008 Novell, Inc.\n"
@@ -642,29 +668,29 @@ msgstr ""
 "Copyright  2005-2008 Novell, Inc.\n"
 "èèååäççèçèèçèè"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:948
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "çäççæççèèçèéççéçåéæçåã"
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:950
 msgid "NetworkManager Website"
 msgstr "NetworkManager çç"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:965
 msgid "Missing resources"
 msgstr "éåèæ"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:990
 msgid "Mobile broadband network password"
 msgstr "èååéçèåç"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:999
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "éçèã%sãéèåçã"
 
-#: ../src/applet-dialogs.c:858
+#: ../src/applet-dialogs.c:1018
 msgid "Password:"
 msgstr "åçï"
 
@@ -950,6 +976,10 @@ msgid "NetworkManager Applet"
 msgstr "NetworkManager éæçå"
 
 #: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåèééåèç"
+
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "èé(_U)"
 
@@ -969,11 +999,11 @@ msgstr "æççè 802.1X éè"
 msgid "_Network name:"
 msgstr "çèåç(_N)ï"
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:72
 msgid "automatic"
 msgstr "èå"
 
-#: ../src/connection-editor/ce-page.c:305
+#: ../src/connection-editor/ce-page.c:310
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "çæäæçéèäéçæåçææåæã"
 
@@ -1036,7 +1066,7 @@ msgstr "äçèåç(_U):"
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 msgid "Addresses"
-msgstr "äå"
+msgstr "åå"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1448,6 +1478,7 @@ 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-fast.ui.h:1
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:1
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:1
@@ -1477,7 +1508,7 @@ msgstr ""
 #: ../src/connection-editor/page-ip4.c:901
 #: ../src/connection-editor/page-ip6.c:867
 msgid "Address"
-msgstr "äå"
+msgstr "åå"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:762
 #: ../src/connection-editor/page-ip4.c:918
@@ -1503,7 +1534,7 @@ msgstr "åç"
 
 #: ../src/connection-editor/page-dsl.c:139
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1482
+#: ../src/connection-editor/nm-connection-list.c:1498
 msgid "DSL"
 msgstr "DSL"
 
@@ -1644,6 +1675,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-fast.c:277
 #: ../src/wireless-security/eap-method-peap.c:246
 #: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
@@ -1657,7 +1689,7 @@ msgstr "MSCHAP"
 #. Translators: "none" refers to authentication methods
 #: ../src/connection-editor/page-ppp.c:141
 msgid "none"
-msgstr "ç"
+msgstr "ææ"
 
 #: ../src/connection-editor/page-ppp.c:201
 #, c-format
@@ -1674,7 +1706,7 @@ msgstr "çæèå PPP äçèäéã"
 
 #: ../src/connection-editor/page-vpn.c:109
 #: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
+#: ../src/connection-editor/nm-connection-list.c:1494
 msgid "VPN"
 msgstr "VPN"
 
@@ -1688,7 +1720,7 @@ msgid "Could not find VPN plugin service for '%s'."
 msgstr "æäåã%sãç VPN åæçåæåã"
 
 #: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/nm-connection-list.c:900
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN éç %d"
@@ -1704,7 +1736,7 @@ msgstr ""
 
 #: ../src/connection-editor/page-wired.c:267
 #: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
+#: ../src/connection-editor/nm-connection-list.c:1482
 msgid "Wired"
 msgstr "æç"
 
@@ -1743,7 +1775,7 @@ msgstr "%u (%u MHz)"
 
 #: ../src/connection-editor/page-wireless.c:452
 #: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
+#: ../src/connection-editor/nm-connection-list.c:1486
 msgid "Wireless"
 msgstr "çççè"
 
@@ -1902,18 +1934,18 @@ msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "åæã%sã/ã%sãæçæçï%d"
 
 #: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
+#: ../src/connection-editor/nm-connection-list.c:662
 msgid "An unknown error occurred."
 msgstr "ççäæçéèã"
 
 #: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "Error initializing editor"
 msgstr "åååçèåæççéè"
 
 #: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
+#: ../src/connection-editor/nm-connection-list.c:719
+#: ../src/connection-editor/nm-connection-list.c:886
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1927,25 +1959,25 @@ msgstr "çæåçæéç"
 msgid "Could not edit new connection"
 msgstr "çæçèæéç"
 
-#: ../src/connection-editor/nm-connection-list.c:717
+#: ../src/connection-editor/nm-connection-list.c:733
 msgid "Could not edit connection"
 msgstr "çæçèéç"
 
-#: ../src/connection-editor/nm-connection-list.c:747
+#: ../src/connection-editor/nm-connection-list.c:763
 msgid "Connection delete failed"
 msgstr "åééçåæ"
 
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/nm-connection-list.c:795
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "æçåèåééç %s ï"
 
-#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:930
 #: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "çæåå VPN çèéç"
 
-#: ../src/connection-editor/nm-connection-list.c:916
+#: ../src/connection-editor/nm-connection-list.c:932
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1955,74 +1987,74 @@ msgstr ""
 "\n"
 "éèïææ VPN æåéåã"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:945
 msgid "Could not edit imported connection"
 msgstr "çæçèååçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1099
+#: ../src/connection-editor/nm-connection-list.c:1115
 msgid "Name"
 msgstr "åç"
 
-#: ../src/connection-editor/nm-connection-list.c:1111
+#: ../src/connection-editor/nm-connection-list.c:1127
 msgid "Last Used"
 msgstr "æåäçç"
 
-#: ../src/connection-editor/nm-connection-list.c:1227
+#: ../src/connection-editor/nm-connection-list.c:1243
 msgid "No VPN plugin available. Please install one to enable this button."
 msgstr "ææ VPN åæçååçãèåèåääçäåçéåæéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1238
+#: ../src/connection-editor/nm-connection-list.c:1254
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1239
+#: ../src/connection-editor/nm-connection-list.c:1255
 msgid "Edit the selected connection"
 msgstr "çèéåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1240
+#: ../src/connection-editor/nm-connection-list.c:1256
 msgid "_Edit..."
 msgstr "çè(_E)â"
 
-#: ../src/connection-editor/nm-connection-list.c:1241
+#: ../src/connection-editor/nm-connection-list.c:1257
 msgid "Authenticate to edit the selected connection"
 msgstr "éèäçèéåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1256
+#: ../src/connection-editor/nm-connection-list.c:1272
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1257
+#: ../src/connection-editor/nm-connection-list.c:1273
 msgid "Delete the selected connection"
 msgstr "åééåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1258
+#: ../src/connection-editor/nm-connection-list.c:1274
 msgid "_Delete..."
 msgstr "åé(_D)â"
 
-#: ../src/connection-editor/nm-connection-list.c:1259
+#: ../src/connection-editor/nm-connection-list.c:1275
 msgid "Authenticate to delete the selected connection"
 msgstr "éèäåééåçéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1538
+#: ../src/connection-editor/nm-connection-list.c:1554
 msgid "Error creating connection"
 msgstr "åçéçæççéè"
 
-#: ../src/connection-editor/nm-connection-list.c:1539
+#: ../src/connection-editor/nm-connection-list.c:1555
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "äçéåäåçã%sãéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
+#: ../src/connection-editor/nm-connection-list.c:1610
+#: ../src/connection-editor/nm-connection-list.c:1622
 msgid "Error editing connection"
 msgstr "çèéçæççéè"
 
-#: ../src/connection-editor/nm-connection-list.c:1595
+#: ../src/connection-editor/nm-connection-list.c:1611
 #, c-format
 msgid "Don't know how to edit '%s' connections"
 msgstr "äçéåäçèã%sãéç"
 
-#: ../src/connection-editor/nm-connection-list.c:1607
+#: ../src/connection-editor/nm-connection-list.c:1623
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "æäå UUIDã%sãçéç"
@@ -2039,29 +2071,29 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:261
+#: ../src/connection-editor/vpn-helpers.c:262
 msgid "Select file to import"
 msgstr "éæèååçææ"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:313
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "åçã%sãçææåçååã"
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:315
 msgid "_Replace"
 msgstr "åä(_R)"
 
-#: ../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 "ææåèäæåååç VPN éçåä %sï"
 
-#: ../src/connection-editor/vpn-helpers.c:349
+#: ../src/connection-editor/vpn-helpers.c:353
 msgid "Cannot export VPN connection"
 msgstr "äèåå VPN éç"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:355
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2072,7 +2104,7 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:390
 msgid "Export VPN connection..."
 msgstr "åå VPN éçâ"
 
@@ -2130,32 +2162,32 @@ msgstr "åæéèçéçâ"
 msgid "could not find the Bluetooth device."
 msgstr "æäåèçèçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/gnome-bluetooth/bt-widget.c:980
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "éèçèçéæååéåèåææçèéçååçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1007
+#: ../src/gnome-bluetooth/bt-widget.c:1012
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr "çæéèèççéçïçæéè D-Busï%sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1017
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
+#: ../src/gnome-bluetooth/bt-widget.c:1031
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
+#: ../src/gnome-bluetooth/bt-widget.c:1098
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "äçææäççèèçïPAN/NAPï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
+#: ../src/gnome-bluetooth/bt-widget.c:1107
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "äçææååçéçèïDUNï"
 
@@ -2507,37 +2539,72 @@ msgstr "DER, PEM, æ PKCS#12 çåéé(*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ PEM æè (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: ../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:3
+msgid "Anonymous"
+msgstr "åå"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+msgid "Authenticated"
+msgstr "åéè"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:5
+msgid "Both"
+msgstr "åè"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "åééè(_N):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+msgid "_Allow automatic PAC provisioning"
+msgstr "åèèåäæ P_AC"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "_PAC file:"
+msgstr "_PAC ææï"
+
+#: ../src/wireless-security/eap-method-fast.c:261
 #: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
+#: ../src/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "éæäå PAC ææâ"
+
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC ææ (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr "ææææ"
+
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:373
+msgid "MD5"
+msgstr "MD5"
+
 #: ../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 "éææèææåä(CA)æèâ"
 
-#: ../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-peap.ui.h:4
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 #: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "C_A certificate:"
 msgstr "CA æè(_A)ï"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
-msgstr "åééè(_N):"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "Version 0"
 msgstr "çæ 0"
@@ -2607,15 +2674,19 @@ msgstr "å"
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:385
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:409
+msgid "FAST"
+msgstr "å"
+
+#: ../src/wireless-security/wireless-security.c:420
 msgid "Tunneled TLS"
 msgstr "çéå TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:431
 msgid "Protected EAP (PEAP)"
 msgstr "äèå EAP (PEAP)"
 
@@ -2660,170 +2731,3 @@ msgstr "WEP çå(_X):"
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "_Key:"
 msgstr "éé(_K)ï"
-
-#~ msgid "United Kingdom"
-#~ msgstr "èå"
-
-#~ msgid "C_onnect"
-#~ msgstr "éç(_O)"
-
-#~ msgid "Other Wireless Network..."
-#~ msgstr "ååçççèâ"
-
-#~ msgid "label"
-#~ msgstr "æç"
-
-#~ msgid "Network Manager"
-#~ msgstr "çèççå"
-
-#~ msgid "An instance of nm-applet is already running.\n"
-#~ msgstr "nm-applet æååèäã\n"
-
-#~ msgid "Could not acquire the %s service. (%d)\n"
-#~ msgstr "çæåå %s æåã(%d)\n"
-
-#~ msgid "could not connect to the system bus."
-#~ msgstr "çæéçèççåææã"
-
-#~ msgid "Cannot start VPN connection '%s'"
-#~ msgstr "çæåè VPN éçâ%sâ"
-
-#~ msgid ""
-#~ "Could not find the authentication dialog for VPN connection type '%s'. "
-#~ "Contact your system administrator."
-#~ msgstr "æäå VPN éçéåã%sãçéèåèçãèéçæçççççåã"
-
-#~ msgid ""
-#~ "There was a problem launching the authentication dialog for VPN "
-#~ "connection type '%s'. Contact your system administrator."
-#~ msgstr "åè VPN éçéåã%sãçéèåèçççåéãèéçæçççççåã"
-
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "ååçèæääæèïèéäåéåéäç\n"
-#~ "ääååïGNOME çèåéæåååèæï\n"
-#~ "community linuxhall org\n"
-#~ "\n"
-#~ "Hialan Liu <hialan liu gmail com>, 2008.\n"
-#~ "Woodman Tuen <wmtuen gmail com>, 2005."
-
-#~ msgid ""
-#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-#~ msgstr "<span size=\"larger\" weight=\"bold\">äçäççèéç</span>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Version 0\n"
-#~ "Version 1"
-#~ msgstr ""
-#~ "èå\n"
-#~ "ç 0 ç\n"
-#~ "ç 1 ç"
-
-#~ msgid "<b>Addresses</b>"
-#~ msgstr "<b>äå</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Automatic with manual DNS settings\n"
-#~ "Manual\n"
-#~ "Link-Local\n"
-#~ "Shared to other computers"
-#~ msgstr ""
-#~ "èå\n"
-#~ "èåäæåèå DNS èåå\n"
-#~ "æåçéç\n"
-#~ "åäçåäéè"
-
-#~ msgid "<b>Basic</b>"
-#~ msgstr "<b>åæ</b>"
-
-#~ msgid ""
-#~ "Any\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "Prefer 3G (UMTS/HSPA)\n"
-#~ "Prefer 2G (GPRS/EDGE)"
-#~ msgstr ""
-#~ "ää\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "åå 3G (UMTS/HSPA)\n"
-#~ "åå 2G (GPRS/EDGE)"
-
-#~ msgid "<b>Authentication</b>"
-#~ msgstr "<b>éè</b>"
-
-#~ msgid "<b>Echo</b>"
-#~ msgstr "<b>åé</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-#~ msgstr ""
-#~ "èå\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Twisted Pair (TP)\n"
-#~ "Attachment Unit Interface (AUI)\n"
-#~ "BNC\n"
-#~ "Media Independent Interface (MII)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "éçç (TP)\n"
-#~ "æèååäé (AUI)\n"
-#~ "BNC\n"
-#~ "åäçéäé (MII)"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-
-#~ msgid ""
-#~ "The connection editor could not find some required resources (the "
-#~ "NetworkManager applet glade file was not found)."
-#~ msgstr ""
-#~ "éççèåçææåääéèçèæïæäå NetworkManager éæçå glade "
-#~ "æï"
-
-#~ msgid "Country"
-#~ msgstr "åå"
-
-#~ msgid "PUK code required"
-#~ msgstr "éè PUK ç"
-
-#~ msgid "PUK code is needed for the mobile broadband device"
-#~ msgstr "éåèååéèçéè PUK ç"
-
-#~ msgctxt "No wired security used"
-#~ msgid "None"
-#~ msgstr "ç"
-
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
-#~ msgid "Unknown"
-#~ msgstr "äæ"
-
-#~ msgid "_Routes&#x2026;"
-#~ msgstr "èç&#x2026;(_R)"
-
-#~ msgid "Apply"
-#~ msgstr "åç"
-
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "ååéåéççæéèäçææäçèã"
-
-#~ msgid "Apply..."
-#~ msgstr "åçâ"



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