[network-manager-applet] Updated Japanese translation



commit d8b1c55390bd1a7b1eedb9204662df6fc6f078aa
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Tue Oct 23 20:56:16 2012 +0900

    Updated Japanese translation

 po/ja.po |  816 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 461 insertions(+), 355 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 533a916..a6d9205 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,15 +8,15 @@
 # Hideki Yamane <henrich debian or jp>, 2010.
 # Hideki Yamane <henrich debian org>, 2011.
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010-2012.
-# Takayoshi OKANO <kano na rim or jp>, 2011, 2012.
+# Takayoshi OKANO <kano na rim or jp>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n";
-"POT-Creation-Date: 2012-09-21 21:19+0000\n"
-"PO-Revision-Date: 2012-08-19 19:57+0900\n"
-"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
+"POT-Creation-Date: 2012-10-19 22:16+0000\n"
+"PO-Revision-Date: 2012-10-12 13:35+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -70,8 +70,9 @@ msgid "Suppress networks available notifications"
 msgstr "ããããããäçåèéçãæåãã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "ããã true ãããããWi-Fi ãããããããåçåèãæãéçãçåããããã"
+msgstr "ããã true ãããããççãããããããåçåèãæãéçãçåããããã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -102,45 +103,46 @@ msgid "Set this to true to disable warnings about CA certificates in phase 2 of
 msgstr "ããã true ãããããEAP èèããããã 2 ãã CA èææééãèåãçåããããã"
 
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#, fuzzy
 msgid "802.1X authentication"
-msgstr "802.1X ãèè"
+msgstr "æç 802.1X ãèè"
 
 #: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
 #: ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ããããããå(_N):"
 
-#: ../src/applet.c:512
+#: ../src/applet.c:513
 msgid "Failed to add/activate connection"
 msgstr "æçãèåãããããæåãããããåæãããã"
 
-#: ../src/applet.c:514 ../src/applet.c:558 ../src/applet.c:584
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:515 ../src/applet.c:559 ../src/applet.c:585
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
 msgid "Unknown error"
 msgstr "äæãããã"
 
-#: ../src/applet.c:517 ../src/applet.c:587 ../src/applet-device-wifi.c:1382
-#: ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:518 ../src/applet.c:588 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
 msgid "Connection failure"
 msgstr "æçãåæ"
 
-#: ../src/applet.c:556
+#: ../src/applet.c:557
 msgid "Device disconnect failed"
 msgstr "ãããããåæãåæãããã"
 
-#: ../src/applet.c:561
+#: ../src/applet.c:562
 msgid "Disconnect failure"
 msgstr "åæåæ"
 
-#: ../src/applet.c:582
+#: ../src/applet.c:583
 msgid "Connection activation failed"
 msgstr "æçãæåãããããåæãããã"
 
-#: ../src/applet.c:948 ../src/applet-device-wifi.c:1072
+#: ../src/applet.c:953 ../src/applet-device-wifi.c:1069
 msgid "Don't show this message again"
 msgstr "äåãããããããããèçããã"
 
-#: ../src/applet.c:1037
+#: ../src/applet.c:1042
 #, c-format
 msgid ""
 "\n"
@@ -149,7 +151,7 @@ msgstr ""
 "\n"
 "ããããããæçãåãèããããçãVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1040
+#: ../src/applet.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -158,7 +160,7 @@ msgstr ""
 "\n"
 "VPN ãããããäæãåæããçãVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -167,7 +169,7 @@ msgstr ""
 "\n"
 "VPN ãããããçåãèåãèãããããVPN æç '%s'ãåæããããã"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:1051
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +178,7 @@ msgstr ""
 "\n"
 "æçèèããããããããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:1054
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +187,7 @@ msgstr ""
 "\n"
 "VPN ãããããæéåãéåããããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:1057
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +196,7 @@ msgstr ""
 "\n"
 "VPN ãããããéåãåæãããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:1060
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +205,7 @@ msgstr ""
 "\n"
 "æåã VPN secret ããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +214,7 @@ msgstr ""
 "\n"
 "VPN secret ãçåããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1065
+#: ../src/applet.c:1070
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +223,7 @@ msgstr ""
 "\n"
 "VPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:1088
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +232,7 @@ msgstr ""
 "\n"
 "ããããããæçãåãèãããããããVPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:1091
 #, c-format
 msgid ""
 "\n"
@@ -239,7 +241,7 @@ msgstr ""
 "\n"
 "VPN ãããããåæãããããVPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:1097
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +250,7 @@ msgstr ""
 "\n"
 "VPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1122
+#: ../src/applet.c:1127
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -259,19 +261,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:1129
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN æçãççãæåããããã\n"
 
-#: ../src/applet.c:1126
+#: ../src/applet.c:1131
 msgid "VPN Login Message"
 msgstr "VPN ããããããããã"
 
-#: ../src/applet.c:1132 ../src/applet.c:1140 ../src/applet.c:1190
+#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
 msgid "VPN Connection Failed"
 msgstr "VPN æçãåæãããã"
 
-#: ../src/applet.c:1197
+#: ../src/applet.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +285,7 @@ msgstr ""
 "VPN ãããããéåãåæãããããVPN æç '%s' ãåæãããããn\n"
 "%s"
 
-#: ../src/applet.c:1200
+#: ../src/applet.c:1205
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +307,7 @@ msgid "device not ready"
 msgstr "ãããããæåãããããããã"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:232
+#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:229
 msgid "disconnected"
 msgstr "åæãããããã"
 
@@ -348,8 +350,9 @@ msgstr "ãããããããæåããã(_N)"
 
 #. 'Enable Wi-Fi' item
 #: ../src/applet.c:2084
+#, fuzzy
 msgid "Enable _Wi-Fi"
-msgstr "Wi-Fi ãæåããã(_W)"
+msgstr "ççãæåããã(_W)"
 
 #. 'Enable Mobile Broadband' item
 #: ../src/applet.c:2093
@@ -404,9 +407,9 @@ msgstr "ããããããæç '%s' ãæåä..."
 msgid "User authentication required for network connection '%s'..."
 msgstr "ããããããæç '%s' ãããããèèãåèãã..."
 
-#: ../src/applet.c:2525 ../src/applet-device-bt.c:239
-#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:541
-#: ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2525 ../src/applet-device-bt.c:235
+#: ../src/applet-device-cdma.c:484 ../src/applet-device-gsm.c:538
+#: ../src/applet-device-wimax.c:469
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ããããããããããããèæããããã..."
@@ -444,367 +447,378 @@ msgstr "ããããããæçãããããã"
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ããããã"
 
-#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:450
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:393
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-gsm.c:447
+#: ../src/applet-device-wifi.c:859 ../src/applet-device-wimax.c:275
 msgid "Available"
 msgstr "åçåè"
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:492
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:435
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-gsm.c:489
+#: ../src/applet-device-wimax.c:419
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "çå'%s' ãæçãããããã"
 
-#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:496
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:439
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-gsm.c:493
+#: ../src/applet-device-wifi.c:1261 ../src/applet-device-wimax.c:423
 msgid "Connection Established"
 msgstr "æçãççãããã"
 
-#: ../src/applet-device-bt.c:204
+#: ../src/applet-device-bt.c:200
 msgid "You are now connected to the mobile broadband network."
 msgstr "çåãããããããããããããããããããæçãããããã"
 
-#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:226 ../src/applet-device-cdma.c:475
+#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:460
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ãæåäãã..."
 
-#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:229 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:463
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ãèåäãã..."
 
-#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:538 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:232 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:466
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ããããããèèãåèãã..."
 
-#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:559
+#: ../src/applet-device-bt.c:239 ../src/applet-device-cdma.c:502
+#: ../src/applet-device-gsm.c:556
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ãããããããããããæç '%s' ããããããããã"
 
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:714
+#: ../src/applet-device-cdma.c:182 ../src/connection-editor/page-mobile.c:715
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:396
+#: ../src/applet-device-cdma.c:339 ../src/applet-device-gsm.c:393
 #: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ããããããããããã (%s)"
 
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:398
-#: ../src/connection-editor/new-connection.c:87
-#: ../src/connection-editor/page-mobile.c:388
+#: ../src/applet-device-cdma.c:341 ../src/applet-device-gsm.c:395
+#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
 msgid "Mobile Broadband"
 msgstr "ããããããããããã"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:409
+#: ../src/applet-device-cdma.c:406
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "æèãããããããããããã (CDMA) æç..."
 
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:440
 msgid "You are now connected to the CDMA network."
 msgstr "çå CDMA ãããããããæçãããããã"
 
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet-device-cdma.c:497 ../src/applet-device-gsm.c:551
+#: ../src/applet-device-wimax.c:478
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "ãããããããããããæç '%s' ããããããã: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:557
-#: ../src/applet-device-wimax.c:485
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
+#: ../src/applet-device-wimax.c:481
 msgid "roaming"
 msgstr "ããããã"
 
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:641 ../src/applet-device-cdma.c:647
 msgid "CDMA network."
 msgstr "CDMA ãããããã"
 
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1202
+#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1199
 msgid "You are now registered on the home network."
 msgstr "ããããããããããæçããããã"
 
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1208
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1205
 msgid "You are now registered on a roaming network."
 msgstr "ããããããããããããæçããããã"
 
 #: ../src/applet-device-ethernet.c:62
 msgid "Auto Ethernet"
-msgstr "èå Ethernet"
+msgstr "èåãããããã"
 
-#: ../src/applet-device-ethernet.c:205
-#, c-format
+#: ../src/applet-device-ethernet.c:202
+#, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
-msgstr "Ethernet ãããããã (%s)"
+msgstr "æçãããããã (%s)"
 
-#: ../src/applet-device-ethernet.c:207
-#, c-format
+#: ../src/applet-device-ethernet.c:204
+#, fuzzy, c-format
 msgid "Ethernet Network (%s)"
-msgstr "Ethernet ãããããã (%s)"
+msgstr "æçãããããã (%s)"
 
-#: ../src/applet-device-ethernet.c:210
+#: ../src/applet-device-ethernet.c:207
+#, fuzzy
 msgid "Ethernet Networks"
-msgstr "Ethernet ãããããã"
+msgstr "æçãããããã"
 
-#: ../src/applet-device-ethernet.c:212
+#: ../src/applet-device-ethernet.c:209
+#, fuzzy
 msgid "Ethernet Network"
-msgstr "Ethernet ãããããã"
+msgstr "æçãããããã"
 
-#: ../src/applet-device-ethernet.c:274
+#: ../src/applet-device-ethernet.c:271
+#, fuzzy
 msgid "You are now connected to the ethernet network."
-msgstr "Ethernet ãããããããæçããããã"
+msgstr "æçãããããããæçããããã"
 
-#: ../src/applet-device-ethernet.c:300
-#, c-format
+#: ../src/applet-device-ethernet.c:297
+#, fuzzy, c-format
 msgid "Preparing ethernet network connection '%s'..."
-msgstr "Ethernet ããããããæç '%s' ãæåäãã..."
+msgstr "æçããããããæç '%s' ãæåäãã..."
 
-#: ../src/applet-device-ethernet.c:303
-#, c-format
+#: ../src/applet-device-ethernet.c:300
+#, fuzzy, c-format
 msgid "Configuring ethernet network connection '%s'..."
-msgstr "Ethernet ããããããæç '%s' ãèåäãã..."
+msgstr "æçããããããæç '%s' ãèåäãã..."
 
-#: ../src/applet-device-ethernet.c:306
-#, c-format
+#: ../src/applet-device-ethernet.c:303
+#, fuzzy, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
-msgstr "Ethernet ããããããæç '%s'ããããããèèãåèãã..."
+msgstr "æçããããããæç '%s'ããããããèèãåèãã..."
 
-#: ../src/applet-device-ethernet.c:309
-#, c-format
+#: ../src/applet-device-ethernet.c:306
+#, fuzzy, c-format
 msgid "Requesting an ethernet network address for '%s'..."
-msgstr "'%s' çã Ethernet ãããããããããããèæããããã..."
+msgstr "'%s' çãæçãããããããããããèæããããã..."
 
-#: ../src/applet-device-ethernet.c:313
-#, c-format
+#: ../src/applet-device-ethernet.c:310
+#, fuzzy, c-format
 msgid "Ethernet network connection '%s' active"
-msgstr "Ethernet ããããããæç '%s' ãããããããã"
+msgstr "æçããããããæç '%s' ãããããããã"
 
-#: ../src/applet-device-ethernet.c:494
+#: ../src/applet-device-ethernet.c:491
 msgid "DSL authentication"
 msgstr "DSL èè"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:717
+#: ../src/applet-device-gsm.c:214 ../src/connection-editor/page-mobile.c:718
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:463
+#: ../src/applet-device-gsm.c:460
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æèãããããããããããã (GSM) æç..."
 
-#: ../src/applet-device-gsm.c:497
+#: ../src/applet-device-gsm.c:494
 msgid "You are now connected to the GSM network."
 msgstr "çå GSM ãããããããæçãããããã"
 
-#: ../src/applet-device-gsm.c:658
+#: ../src/applet-device-gsm.c:655
 msgid "PIN code required"
 msgstr "PIN ããããåèãã"
 
-#: ../src/applet-device-gsm.c:666
+#: ../src/applet-device-gsm.c:663
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ããããããããããããããããã PIN ããããåèãã"
 
-#: ../src/applet-device-gsm.c:787
+#: ../src/applet-device-gsm.c:784
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%2$s' äã SIM ããã '%1$s' ã PIN ããã"
 
-#: ../src/applet-device-gsm.c:879
+#: ../src/applet-device-gsm.c:876
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ãéããã; ãããããããéçããããããã"
 
-#: ../src/applet-device-gsm.c:902
+#: ../src/applet-device-gsm.c:899
 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:929
+#: ../src/applet-device-gsm.c:926
 msgid "Sending unlock code..."
 msgstr "ééããããéää..."
 
-#: ../src/applet-device-gsm.c:992
+#: ../src/applet-device-gsm.c:989
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ãééãåèãã"
 
-#: ../src/applet-device-gsm.c:993
+#: ../src/applet-device-gsm.c:990
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ãééãåèãã"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:995
+#: ../src/applet-device-gsm.c:992
 #, c-format
 msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
 msgstr "ããããããããããããããã %s' ãäçãããã SIM PIN ããããããåèããã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:997
+#: ../src/applet-device-gsm.c:994
 msgid "PIN code:"
 msgstr "PIN ããã:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet-device-gsm.c:998
 msgid "Show PIN code"
 msgstr "PIN ããããèç"
 
-#: ../src/applet-device-gsm.c:1004
+#: ../src/applet-device-gsm.c:1001
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK ãããããããåèãã"
 
-#: ../src/applet-device-gsm.c:1005
+#: ../src/applet-device-gsm.c:1002
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK ãããããããåèãã"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1007
+#: ../src/applet-device-gsm.c:1004
 #, c-format
 msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
 msgstr "ããããããããããããããã '%s' ãäçãããã SIM PUK ããããåèããã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1009
+#: ../src/applet-device-gsm.c:1006
 msgid "PUK code:"
 msgstr "PUK ããã:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1012
+#: ../src/applet-device-gsm.c:1009
 msgid "New PIN code:"
 msgstr "æèã PIN ããã:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1014
+#: ../src/applet-device-gsm.c:1011
 msgid "Re-enter new PIN code:"
 msgstr "æèã PIN ããããååå:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1019
+#: ../src/applet-device-gsm.c:1016
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ããããèç"
 
-#: ../src/applet-device-gsm.c:1201 ../src/applet-device-gsm.c:1207
+#: ../src/applet-device-gsm.c:1198 ../src/applet-device-gsm.c:1204
 msgid "GSM network."
 msgstr "GSM ãããããã"
 
-#: ../src/applet-device-wifi.c:97
+#: ../src/applet-device-wifi.c:98
+#, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network..."
-msgstr "éèç Wi-Fi ãããããããæç(_C)..."
+msgstr "éèçççãããããããæç(_C)..."
 
-#: ../src/applet-device-wifi.c:148
+#: ../src/applet-device-wifi.c:149
+#, fuzzy
 msgid "Create _New Wi-Fi Network..."
-msgstr "æãã Wi-Fi ãããããããäæ(_N)..."
+msgstr "æããççãããããããäæ(_N)..."
 
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:293
 msgid "(none)"
 msgstr "(ãã)"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
+#: ../src/applet-device-wifi.c:787
+#, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
-msgstr "Wi-Fi ãããããã (%s)"
+msgstr "æçãããããã (%s)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
+#: ../src/applet-device-wifi.c:789
+#, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
-msgstr "Wi-Fi ãããããã (%s)"
+msgstr "æçãããããã (%s)"
 
-#: ../src/applet-device-wifi.c:794
+#: ../src/applet-device-wifi.c:791
+#, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
-msgstr[0] "Wi-Fi ãããããã"
+msgstr[0] "æçãããããã"
 
-#: ../src/applet-device-wifi.c:827
+#: ../src/applet-device-wifi.c:824
+#, fuzzy
 msgid "Wi-Fi is disabled"
-msgstr "Wi-Fi ãçåããããããã"
+msgstr "WiMAX ãçåããããããã"
 
-#: ../src/applet-device-wifi.c:828
+#: ../src/applet-device-wifi.c:825
+#, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
-msgstr "Wi-Fi ãããããããããããããçåããããããã"
+msgstr "WiMAX ãããããããããããããçåããããããã"
 
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:886
 msgid "More networks"
 msgstr "ããäããããããã"
 
-#: ../src/applet-device-wifi.c:1068
+#: ../src/applet-device-wifi.c:1065
+#, fuzzy
 msgid "Wi-Fi Networks Available"
-msgstr "Wi-Fi ãããããããåçåèãã"
+msgstr "ççãããããããåçåèãã"
 
-#: ../src/applet-device-wifi.c:1069
+#: ../src/applet-device-wifi.c:1066
+#, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
-msgstr "Wi-Fi ãããããããæçãããããããããããããããäçãããã"
+msgstr "ççãããããããæçãããããããããããããããäçãããã"
 
-#: ../src/applet-device-wifi.c:1263
-#, c-format
+#: ../src/applet-device-wifi.c:1260
+#, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "Wi-Fi ãããããã '%s' ãæçããããã"
+msgstr "ççãããããã '%s' ãæçããããã"
 
-#: ../src/applet-device-wifi.c:1294
-#, c-format
+#: ../src/applet-device-wifi.c:1291
+#, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
-msgstr "Wi-Fi ããããããæç '%s' ãæåä..."
+msgstr "ããããããæç '%s' ãæåä..."
 
-#: ../src/applet-device-wifi.c:1297
-#, c-format
+#: ../src/applet-device-wifi.c:1294
+#, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
-msgstr "Wi-Fi ããããããæç '%s' ãèåäãã..."
+msgstr "æçããããããæç '%s' ãèåäãã..."
 
-#: ../src/applet-device-wifi.c:1300
-#, c-format
+#: ../src/applet-device-wifi.c:1297
+#, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
-msgstr "Wi-Fi ãããããã '%s' ããããããèèãåèãã..."
+msgstr "ççãããããã '%s' ããããããèèãåèãã..."
 
-#: ../src/applet-device-wifi.c:1303
-#, c-format
+#: ../src/applet-device-wifi.c:1300
+#, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
-msgstr "'%s' ã Wi-Fi ãããããããããããèæããããã..."
+msgstr "'%s' ããããããããããããèæããããã..."
 
-#: ../src/applet-device-wifi.c:1324
-#, c-format
+#: ../src/applet-device-wifi.c:1321
+#, fuzzy, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
-msgstr "Wi-Fi ããããããæç '%s' ããããããã: %s (%d%%)"
+msgstr "ççããããããæç '%s' ããããããã: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1329
-#, c-format
+#: ../src/applet-device-wifi.c:1326
+#, fuzzy, c-format
 msgid "Wi-Fi network connection '%s' active"
-msgstr "Wi-Fi ããããããæç '%s' ãããããããã"
+msgstr "æçããããããæç '%s' ãããããããã"
 
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1374
 msgid "Failed to activate connection"
 msgstr "æçãæåãããããåæãããã"
 
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1393
 msgid "Failed to add new connection"
 msgstr "æèæçãèåãåæãããã"
 
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX ããããããããããã (%s)"
 
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX ããããããããããã"
 
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
 msgid "WiMAX is disabled"
 msgstr "WiMAX ãçåããããããã"
 
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX ãããããããããããããçåããããããã"
 
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
 msgid "You are now connected to the WiMAX network."
 msgstr "çå WiMAX ãããããããæçãããããã"
 
@@ -814,7 +828,7 @@ msgstr "æçæåãèçäãããããèãããã:"
 
 #: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:930
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -833,7 +847,7 @@ msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:887
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ãã"
@@ -1001,7 +1015,7 @@ msgstr "VPN ããã:"
 msgid "Base Connection:"
 msgstr "ãããæç:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "äæ"
 
@@ -1079,13 +1093,11 @@ msgstr " "
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
 #, fuzzy
-#| msgid "Choose a VPN Connection Type"
 msgid "Choose a Connection Type"
 msgstr "VPN æçãçéãéãããããã"
 
 #: ../src/connection-editor/ce-new-connection.ui.h:3
 #, fuzzy
-#| msgid "Select the type of VPN you wish to use for the new connection.  If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed."
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1100,7 +1112,7 @@ msgstr "äæâ"
 msgid "automatic"
 msgstr "èå"
 
-#: ../src/connection-editor/ce-page.c:294
+#: ../src/connection-editor/ce-page.c:356
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "äæãããããããæç secret ãææããããããããã"
 
@@ -1118,7 +1130,6 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
 #, fuzzy
-#| msgid "Broadcast Address:"
 msgid "Broadcast"
 msgstr "ãããããããããããã:"
 
@@ -1140,31 +1151,28 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:9
 #, fuzzy
-#| msgid "EAP"
 msgid "ARP"
 msgstr "EAP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
 #, fuzzy
-#| msgid "Base Connection:"
 msgid "Bonded _connections:"
 msgstr "ãããæç:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
 #, fuzzy
-#| msgid "M_ode:"
 msgid "_Mode:"
 msgstr "ããã(_O):"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/nm-connection-list.c:680
+#: ../src/connection-editor/nm-connection-list.c:682
 msgid "_Edit"
 msgstr "çé(_E)"
 
 #. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "åé(_D)"
 
@@ -1178,7 +1186,6 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:16
 #, fuzzy
-#| msgid "Interface:"
 msgid "_Interface name:"
 msgstr "ãããããããã:"
 
@@ -1308,12 +1315,14 @@ msgstr "ãããååããã MAC ããããããããæçãåçã
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "_MTU:"
 msgstr "MTU(_M):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "bytes"
 msgstr "ããã"
@@ -1330,7 +1339,6 @@ msgstr ""
 #. IP-over-InfiniBand "connected mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #, fuzzy
-#| msgid "disconnected"
 msgid "Connected"
 msgstr "åæãããããã"
 
@@ -1443,7 +1451,6 @@ msgstr "2G åå (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
 #, fuzzy
-#| msgid "Prefer 3G (UMTS/HSPA)"
 msgid "Prefer 4G (LTE)"
 msgstr "3G åå (UMTS/HSPA)"
 
@@ -1541,6 +1548,34 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "PPP Echo ããããããéä(_E)"
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "ãããããããã:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "_Cloned MAC address:"
+msgstr "ãããããã MAC ãããã(_L):"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
 msgstr "ãããããã(_E):"
@@ -1578,26 +1613,22 @@ msgid "_Rate:"
 msgstr "ããã(_R):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr "ãããããããããããååãããã BSSID ãæåããã Wi-Fi ãããããããã (AP) ãããæçãããããããã"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
 msgstr "ããããã(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
 msgstr "ããã(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "ããã(_O):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
@@ -1681,123 +1712,140 @@ msgstr "ããããã"
 msgid "Prefix"
 msgstr "ããããããã"
 
-#: ../src/connection-editor/new-connection.c:77
-#: ../src/connection-editor/page-ethernet.c:272
+#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
+#, fuzzy
 msgid "Ethernet"
-msgstr "Ethernet"
+msgstr "èåãããããã"
 
-#: ../src/connection-editor/new-connection.c:82
-#: ../src/connection-editor/page-wifi.c:460
+#: ../src/connection-editor/new-connection.c:106
+#: ../src/connection-editor/page-wifi.c:470 ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:92
-#: ../src/connection-editor/page-wimax.c:155 ../src/mb-menu-item.c:75
+#: ../src/connection-editor/new-connection.c:118
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:75
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../src/connection-editor/new-connection.c:97
-#: ../src/connection-editor/page-dsl.c:140
+#: ../src/connection-editor/new-connection.c:124
+#: ../src/connection-editor/page-dsl.c:141
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-infiniband.c:191
+#: ../src/connection-editor/new-connection.c:130
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-bond.c:746
+#: ../src/connection-editor/new-connection.c:136
+#: ../src/connection-editor/page-bond.c:747 ../src/libnm-gtk/nm-ui-utils.c:337
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-vpn.c:112
+#: ../src/connection-editor/new-connection.c:142
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:155
+#: ../src/connection-editor/new-connection.c:295
+#: ../src/connection-editor/page-vpn.c:113
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/new-connection.c:245
+#, fuzzy
+msgid "Hardware"
+msgstr "ãããããããããã:"
+
+#: ../src/connection-editor/new-connection.c:265
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:333
+#: ../src/connection-editor/new-connection.c:335
 #, fuzzy
-#| msgid "Export VPN connection..."
 msgid "Import a saved VPN configuration..."
 msgstr "VPN æçããããããããã..."
 
-#: ../src/connection-editor/new-connection.c:274
+#: ../src/connection-editor/new-connection.c:364
 msgid "The connection editor dialog could not be initialized due to an unknown error."
 msgstr "æçããããããããããããäæããããããããåæååæããããããã"
 
-#: ../src/connection-editor/new-connection.c:283
+#: ../src/connection-editor/new-connection.c:373
 msgid "Could not create new connection"
 msgstr "æããæçãäæãããããããã"
 
-#: ../src/connection-editor/new-connection.c:419
+#: ../src/connection-editor/new-connection.c:508
 msgid "Connection delete failed"
 msgstr "æçãåéãåæãããã"
 
-#: ../src/connection-editor/new-connection.c:466
+#: ../src/connection-editor/new-connection.c:555
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "æåã æç %s ãåéããããããã ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: ../src/connection-editor/nm-connection-editor.c:111
 #, c-format
 msgid "Editing %s"
 msgstr "%s ãçé"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: ../src/connection-editor/nm-connection-editor.c:115
 msgid "Editing un-named connection"
 msgstr "çåãæçãçé"
 
-#: ../src/connection-editor/nm-connection-editor.c:301
+#: ../src/connection-editor/nm-connection-editor.c:302
 msgid "The connection editor could not find some required resources (the .ui file was not found)."
 msgstr "æçããããããåèãããããããããããããããããããããã (.ui ããããããããããããããã)ã"
 
-#: ../src/connection-editor/nm-connection-editor.c:428
+#: ../src/connection-editor/nm-connection-editor.c:429
 msgid "_Save"
 msgstr "äå(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:430
 msgid "Save any changes made to this connection."
 msgstr "ããæçãåãããåæããããäåãããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:430
+#: ../src/connection-editor/nm-connection-editor.c:431
 msgid "_Save..."
 msgstr "äå(_S)..."
 
-#: ../src/connection-editor/nm-connection-editor.c:431
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ããããããããããããããçæçãäåãèèããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
-#| msgid "Could not create new connection"
 msgid "Could not create connection"
 msgstr "æããæçãäæãããããããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:448
 msgid "Could not edit connection"
 msgstr "æçãçéãããããããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:449
+#: ../src/connection-editor/nm-connection-editor.c:450
 #, fuzzy
-#| msgid "Error creating connection editor dialog."
 msgid "Unknown error creating connection editor dialog."
 msgstr "æçãããããããããããäæäããããããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:555
+#: ../src/connection-editor/nm-connection-editor.c:556
 msgid "Error saving connection"
 msgstr "æçæåãäåäãããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:556
+#: ../src/connection-editor/nm-connection-editor.c:557
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "ããããã '%s' / '%s' ãçåãã: %d"
 
-#: ../src/connection-editor/nm-connection-editor.c:658
+#: ../src/connection-editor/nm-connection-editor.c:659
 msgid "Error initializing editor"
 msgstr "ããããããåæåäãããããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:967
+#: ../src/connection-editor/nm-connection-editor.c:973
 msgid "Connection add failed"
 msgstr "æçãèåãåæãããã"
 
@@ -1815,7 +1863,6 @@ msgstr "ãããããããããåçåè(_V)"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:5
 #, fuzzy
-#| msgid "E_xport"
 msgid "_Export..."
 msgstr "ãããããã(_X)"
 
@@ -1859,65 +1906,66 @@ msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d åå"
 
-#: ../src/connection-editor/nm-connection-list.c:626
+#: ../src/connection-editor/nm-connection-list.c:628
 msgid "Name"
 msgstr "åå"
 
-#: ../src/connection-editor/nm-connection-list.c:639
+#: ../src/connection-editor/nm-connection-list.c:641
 msgid "Last Used"
 msgstr "ååãäç"
 
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "Edit the selected connection"
 msgstr "éæããæçãçéãã"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "_Edit..."
 msgstr "çé(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "éæããæçãçéãèèãã"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "éæããæçãåéãã"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "_Delete..."
 msgstr "åé(_D)..."
 
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "Authenticate to delete the selected connection"
 msgstr "éæããæçãåéãèèãã"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:939
 msgid "Error creating connection"
 msgstr "æçãäæäãããã"
 
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:940
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "æç '%s' ãäæææããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:995
 msgid "Error editing connection"
 msgstr "æçãçéããããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:996
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' ãæçãçèãããããããã"
 
-#: ../src/connection-editor/page-8021x-security.c:120
+#: ../src/connection-editor/page-8021x-security.c:121
 msgid "802.1x Security"
 msgstr "802.1x ãããããã"
 
-#: ../src/connection-editor/page-8021x-security.c:122
+#: ../src/connection-editor/page-8021x-security.c:123
+#, fuzzy
 msgid "Could not load 802.1x Security user interface."
-msgstr "802.1x ãããããããããããããããããããèãèããããã"
+msgstr "WiFi ãããããããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-8021x-security.c:140
+#: ../src/connection-editor/page-8021x-security.c:141
 msgid "Use 802.1_X security for this connection"
 msgstr "ããæçã 802.1x ãããããããäçãã(_X)"
 
@@ -1926,52 +1974,49 @@ msgstr "ããæçã 802.1x ãããããããäçãã(_X)"
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:749
+#: ../src/connection-editor/page-bond.c:750
 #, fuzzy
-#| msgid "Could not load DSL user interface."
 msgid "Could not load bond user interface."
-msgstr "DSL ããããããããããããããããããããããããã"
+msgstr "æçããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-bond.c:909
+#: ../src/connection-editor/page-bond.c:910
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "Bond connection %d"
 msgstr "æçæç %d"
 
-#: ../src/connection-editor/page-dsl.c:142
+#: ../src/connection-editor/page-dsl.c:143
 msgid "Could not load DSL user interface."
 msgstr "DSL ããããããããããããããããããããããããã"
 
-#: ../src/connection-editor/page-dsl.c:234
+#: ../src/connection-editor/page-dsl.c:235
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL æç %d"
 
 #: ../src/connection-editor/page-ethernet.c:90
 #: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wifi.c:113
 #: ../src/connection-editor/page-wimax.c:70
 msgid "This option locks this connection to the network device specified by its permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 msgstr "ãããããããããããååãããã MAC ãããããæåãããããããããããããããããæçããããããããä: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:274
+#: ../src/connection-editor/page-ethernet.c:253
+#, fuzzy
 msgid "Could not load ethernet user interface."
-msgstr "Ethernet ããããããããããããããèãèããããã"
+msgstr "æçããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-ethernet.c:450
-#, c-format
+#: ../src/connection-editor/page-ethernet.c:396
+#, fuzzy, c-format
 msgid "Ethernet connection %d"
-msgstr "Ethernet æç %d"
+msgstr "æçæç %d"
 
-#: ../src/connection-editor/page-infiniband.c:194
+#: ../src/connection-editor/page-infiniband.c:171
 #, fuzzy
-#| msgid "Could not load WiFi user interface."
 msgid "Could not load InfiniBand user interface."
 msgstr "WiFi ããããããããããããããããåæããããããã"
 
-#: ../src/connection-editor/page-infiniband.c:319
+#: ../src/connection-editor/page-infiniband.c:263
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "æçæç %d"
 
@@ -2037,11 +2082,11 @@ msgstr "èåãæçãããã(_E):"
 msgid "Editing IPv4 routes for %s"
 msgstr "%s çã IPv4 ããããçé"
 
-#: ../src/connection-editor/page-ip4.c:993
+#: ../src/connection-editor/page-ip4.c:994
 msgid "IPv4 Settings"
 msgstr "IPv4 ããããããã"
 
-#: ../src/connection-editor/page-ip4.c:995
+#: ../src/connection-editor/page-ip4.c:996
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ãããããããããããããèãèããããã"
 
@@ -2063,36 +2108,36 @@ msgstr "èåãDHCP ãã"
 msgid "Editing IPv6 routes for %s"
 msgstr "%s çã IPv6 ããããçé"
 
-#: ../src/connection-editor/page-ip6.c:957
+#: ../src/connection-editor/page-ip6.c:958
 msgid "IPv6 Settings"
 msgstr "IPv6 ããããããã"
 
-#: ../src/connection-editor/page-ip6.c:959
+#: ../src/connection-editor/page-ip6.c:960
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ãããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-mobile.c:390
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
 msgstr "ãããããããããããããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-mobile.c:407
+#: ../src/connection-editor/page-mobile.c:408
 msgid "Unsupported mobile broadband connection type."
 msgstr "ããããããããããããããããããããããæçãããã"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:657
+#: ../src/connection-editor/page-mobile.c:658
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ããããããããããããããããããããããéæ"
 
-#: ../src/connection-editor/page-mobile.c:692
+#: ../src/connection-editor/page-mobile.c:693
 msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
 msgstr "ãããããããããããããããããããäçããæèãéæããããããã äæãååãããããããããåããããããã"
 
-#: ../src/connection-editor/page-mobile.c:697
+#: ../src/connection-editor/page-mobile.c:698
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "çãããããããã GSM ããããæè (äããã GPRS, EDGE, UMTS, HSDPA) ãäçããã(_G)"
 
-#: ../src/connection-editor/page-mobile.c:704
+#: ../src/connection-editor/page-mobile.c:705
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "çãããããããã CDMA ããããæè (äããã1xRTT, EVDO)ãäçããã(_D)"
 
@@ -2132,30 +2177,40 @@ msgstr "ãã"
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s çã PPP èèææãçé"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:284
 msgid "PPP Settings"
 msgstr "PPP ãèå"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:286
 msgid "Could not load PPP user interface."
 msgstr "PPP ãããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vlan.c:482
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "IPv4 ãããããããããããããèãèããããã"
+
+#: ../src/connection-editor/page-vlan.c:678
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN æç %d"
+
+#: ../src/connection-editor/page-vpn.c:115
 msgid "Could not load VPN user interface."
 msgstr "VPN ãããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:130
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' çã VPN ããããããããããèäããããããããã"
 
-#: ../src/connection-editor/page-vpn.c:223
-#: ../src/connection-editor/page-vpn.c:320
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN æç %d"
 
-#: ../src/connection-editor/page-vpn.c:249
+#: ../src/connection-editor/page-vpn.c:250
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2165,86 +2220,97 @@ msgstr ""
 "\n"
 "ããã: VPN ãããããããããããããã"
 
-#: ../src/connection-editor/page-vpn.c:274
+#: ../src/connection-editor/page-vpn.c:275
 msgid "Choose a VPN Connection Type"
 msgstr "VPN æçãçéãéãããããã"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:276
 msgid "Select the type of VPN you wish to use for the new connection.  If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed."
 msgstr "æèæçãäçããã VPN ãããããéæãããããããäæããã VPN æçãçéãäèãçãååããæãã VPN ããããããããããããããããããããããããã"
 
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:98
+#, fuzzy
+msgid "This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr "ãããããããããããååãããã BSSID ãæåãããããããã ãããããããã (AP) ãããæçãããããããã"
+
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
 #, c-format
 msgid "default"
 msgstr "ããããã"
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:219
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:462
+#: ../src/connection-editor/page-wifi.c:472
+#, fuzzy
 msgid "Could not load Wi-Fi user interface."
-msgstr "Wi-Fi ããããããããããããããããåæããããããã"
+msgstr "WiFi ããããããããããããããããåæããããããã"
 
-#: ../src/connection-editor/page-wifi.c:667
-#, c-format
+#: ../src/connection-editor/page-wifi.c:649
+#, fuzzy, c-format
 msgid "Wi-Fi connection %d"
-msgstr "Wi-Fi æç %d"
+msgstr "æçæç %d"
 
 #: ../src/connection-editor/page-wifi-security.c:265
+#, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ãã"
 
 #: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:904
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit ãã (HEX ããã ASCII)"
 
 #: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:913
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ãããããã"
 
 #: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:943
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
 msgid "Dynamic WEP (802.1x)"
 msgstr "åç WEP (802.1x)"
 
 #: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:957
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # ããããäæãååãããèããããããã
 #: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:971
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: ../src/connection-editor/page-wifi-security.c:396
+#, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr "Wi-Fi ãããããããããããããããããããèãèãããããWi-Fi èåããããããã"
+msgstr "WiFi ãããããããããããããããããããèãèãããããWiFi èåããããããã"
 
-#: ../src/connection-editor/page-wifi-security.c:406
+#: ../src/connection-editor/page-wifi-security.c:407
+#, fuzzy
 msgid "Wi-Fi Security"
-msgstr "Wi-Fi ãããããã"
+msgstr "ççãããããã"
 
-#: ../src/connection-editor/page-wifi-security.c:408
+#: ../src/connection-editor/page-wifi-security.c:409
+#, fuzzy
 msgid "Could not load Wi-Fi security user interface."
-msgstr "Wi-Fi ãããããããããããããããããããèãèããããã"
+msgstr "WiFi ãããããããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-wimax.c:158
+#: ../src/connection-editor/page-wimax.c:137
+#, fuzzy
 msgid "Could not load WiMAX user interface."
-msgstr "WiMAX ããããããããããããããããåæããããããã"
+msgstr "WiFi ããããããããããããããããåæããããããã"
 
-#: ../src/connection-editor/page-wimax.c:287
-#, c-format
+#: ../src/connection-editor/page-wimax.c:233
+#, fuzzy, c-format
 msgid "WiMAX connection %d"
-msgstr "WiMAX æç %d"
+msgstr "æçæç %d"
 
 #: ../src/connection-editor/vpn-helpers.c:207
 msgid "Cannot import VPN connection"
@@ -2303,16 +2369,14 @@ msgid "The NetworkManager Applet could not find some required resources (the .ui
 msgstr "NetworkManager ããããããåèãããããããããããããããããããããã (.ui ãããããããããããã)ã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:321
-#, fuzzy, c-format
-#| msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Bluetooth ãèåãããããã (D-Bus ããæçãåæ: %s)ã"
+msgstr "Bluetooth ãèåãããããã (D-Bus ããæçãåæ: (%s) %s)ã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:330
-#, fuzzy, c-format
-#| msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#, c-format
 msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Bluetooth ãèåãããããã (NetworkManager ãæçäããããçç: %s)ã"
+msgstr "Bluetooth ãèåãããããã (NetworkManager ãæçäããããçç: (%s) %s)ã"
 
 #: ../src/gnome-bluetooth/bt-widget.c:445
 msgid "Use your mobile phone as a network device (PAN/NAP)"
@@ -2347,7 +2411,7 @@ msgstr "äæãéèãããããããããã (GSM ã CDMA ãããã
 
 #: ../src/gnome-bluetooth/nma-bt-device.c:567
 msgid "unknown modem type."
-msgstr ""
+msgstr "äæããããããããããã"
 
 #: ../src/gnome-bluetooth/nma-bt-device.c:639
 #: ../src/gnome-bluetooth/nma-bt-device.c:645
@@ -2537,66 +2601,112 @@ msgstr "ãããããããã"
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ãããããããããããæçããããããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1643
 msgid "New Mobile Broadband Connection"
 msgstr "æèããããããããããããæç"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:439
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
 msgid "New..."
 msgstr "æè..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1058
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
 msgid "C_reate"
 msgstr "äæ(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
-#, c-format
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
 msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr "Wi-Fi ãããããã '%s' ããããããããããããããããåãæååãããåèããã"
+msgstr "ççãããããã '%s' ããããããããããããããããåãæååãããåèããã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
 msgid "Wi-Fi Network Authentication Required"
-msgstr "Wi-Fi ãããããããèèãåèãã"
+msgstr "ççãããããããèèãåèãã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
 msgid "Authentication required by Wi-Fi network"
-msgstr "Wi-Fi ããããããããèèãèæãããã"
+msgstr "ççããããããããèèãèæãããã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
 msgid "Create New Wi-Fi Network"
-msgstr "æãã Wi-Fi ãããããããäæ"
+msgstr "æããççãããããããäæ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
 msgid "New Wi-Fi network"
-msgstr "æè Wi-Fi ãããããã"
+msgstr "æèççãããããã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
-msgstr "äæããã Wi-Fi ãããããããååãååããããããã"
+msgstr "äæãããççãããããããååãååããããããã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1156
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
-msgstr "éèç Wi-Fi ãããããããæçãã"
+msgstr "éèçççãããããããæçãã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
 msgid "Hidden Wi-Fi network"
-msgstr "éèç Wi-Fi ãããããã"
+msgstr "éèçççãããããã"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
 msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
-msgstr "æçããã Wi-Fi ãããããããååãããããããèçãååããããããã"
+msgstr "æçãããççãããããããååãããããããèçãååããããããã"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:304
+msgid "Wired"
+msgstr "æç"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:376
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:378
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:452 ../src/libnm-gtk/nm-ui-utils.c:470
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
 
 #: ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
 msgid "Wi-Fi _security:"
-msgstr "Wi-Fi ãããããã(_S):"
+msgstr "ççãããããã(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "æç(_O):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
 msgid "Wi-Fi _adapter:"
-msgstr "Wi-Fi ããããã(_A):"
+msgstr "ççããããã(_A):"
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2640,7 +2750,6 @@ msgstr "HSPA"
 
 #: ../src/mb-menu-item.c:73
 #, fuzzy
-#| msgid "HSPA"
 msgid "HSPA+"
 msgstr "HSPA"
 
@@ -2699,19 +2808,19 @@ msgid "Default"
 msgstr "ããããã"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
-#, fuzzy, c-format
-#| msgid "Base Connection:"
+#: ../src/utils/utils.c:174
+#, c-format
 msgid "%s connection"
-msgstr "ãããæç:"
+msgstr "%s æç"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "èæææé(CA)ãèææãéæããããããã"
 
 #: ../src/wireless-security/eap-method.c:276
+#, fuzzy
 msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "èæææé (CA) ãèææãäçãããããååãããèæçã Wi-Fi ãããããããæçããåèæããããããèæææé (CA) ãèææã éæãããã ?"
+msgstr "èæææé (CA) ãèææãäçãããããååãããèæçãããããã ãããããããæçããåèæããããããèæææé (CA) ãèææã éæãããã ?"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
@@ -2918,12 +3027,6 @@ msgstr "ãããèç(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP ãããããã(_X):"
 
-#~ msgid "An unknown error occurred."
-#~ msgstr "äæãããããççããããã"
-
-#~ msgid "Could not edit new connection"
-#~ msgstr "æèæçãçéãããããããã"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "ççãããããã (%s)"
 
@@ -2952,9 +3055,6 @@ msgstr "WEP ãããããã(_X):"
 #~ msgid "Wireless network connection '%s' active"
 #~ msgstr "ççããããããæç '%s' ããããããã"
 
-#~ msgid "Wired"
-#~ msgstr "æç"
-
 #~ msgid "Could not load Wired Security security user interface."
 #~ msgstr "æçããããããããããããããããããããèãèããããã"
 
@@ -2967,6 +3067,12 @@ msgstr "WEP ãããããã(_X):"
 #~ msgid "_Import"
 #~ msgstr "ããããã(_I)"
 
+#~ msgid "An unknown error occurred."
+#~ msgstr "äæãããããççããããã"
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "æèæçãçéãããããããã"
+
 #~ msgid "Could not edit imported connection"
 #~ msgstr "ãããããããæçãçéãããããããã"
 



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