[network-manager-applet] Updated British English translation

From: Bruce Cowan <bcowan src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet] Updated British English translation
Date: Mon, 19 Sep 2011 12:21:54 +0000 (UTC)
commit 886a273e9bffad7127edfe0e0d22e93b5207f811
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Mon Sep 19 13:21:40 2011 +0100

    Updated British English translation

 po/en_GB.po |  999 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 505 insertions(+), 494 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 81e98d5..07bcb41 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 15:11+0100\n"
-"PO-Revision-Date: 2011-03-30 15:11+0100\n"
+"POT-Creation-Date: 2011-09-19 13:20+0100\n"
+"PO-Revision-Date: 2011-09-19 13:21+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Manage your network connections"
@@ -86,23 +86,23 @@ msgstr "Manage and change your network connection settings"
 msgid "Network Connections"
 msgstr "Network Connections"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
-#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
+#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "Available"
 
 #
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
-#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
+#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
 #: ../src/applet-device-wimax.c:423
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "You are now connected to '%s'."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
-#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
+#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Connection Established"
 
@@ -110,121 +110,133 @@ msgstr "Connection Established"
 msgid "You are now connected to the mobile broadband network."
 msgstr "You are now connected to the mobile broadband network."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Preparing mobile broadband connection '%s'â"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configuring mobile broadband connection '%s'â"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
-#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
+#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "User authentication required for mobile broadband connection '%s'â"
 
 #
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
-#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2383
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
+#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2479
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Requesting a network address for '%s'â"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
+#: ../src/applet-device-gsm.c:552
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobile broadband connection '%s' active"
 
-#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
 #: ../src/applet-dialogs.c:405
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobile Broadband (%s)"
 
-#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
-#: ../src/connection-editor/page-mobile.c:372
+#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
+#: ../src/connection-editor/page-mobile.c:379
 #: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1440
+#: ../src/connection-editor/nm-connection-list.c:1474
 msgid "Mobile Broadband"
 msgstr "Mobile Broadband"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:412
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "New Mobile Broadband (CDMA) connectionâ"
 
-#: ../src/applet-device-cdma.c:384
+#: ../src/applet-device-cdma.c:446
 msgid "You are now connected to the CDMA network."
 msgstr "You are now connected to the CDMA network."
 
-#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
 #: ../src/applet-device-wimax.c:482
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobile broadband connection '%s' active: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:550
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "roaming"
 
-#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+msgid "CDMA network."
+msgstr "CDMA network."
+
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
+msgid "You are now registered on the home network."
+msgstr "You are now registered on the home network."
+
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
+msgid "You are now registered on a roaming network."
+msgstr "You are now registered on a roaming network."
+
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:394
+#: ../src/applet-device-gsm.c:456
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "New Mobile Broadband (GSM) connectionâ"
 
-#: ../src/applet-device-gsm.c:428
+#: ../src/applet-device-gsm.c:490
 msgid "You are now connected to the GSM network."
 msgstr "You are now connected to the GSM network."
 
-#: ../src/applet-device-gsm.c:589
+#: ../src/applet-device-gsm.c:651
 msgid "PIN code required"
 msgstr "PIN code required"
 
-#: ../src/applet-device-gsm.c:597
+#: ../src/applet-device-gsm.c:659
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN code is needed for the mobile broadband device"
 
-#: ../src/applet-device-gsm.c:718
+#: ../src/applet-device-gsm.c:784
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Wrong PIN code; please contact your provider."
 
-#: ../src/applet-device-gsm.c:741
+#: ../src/applet-device-gsm.c:807
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Wrong PUK code; please contact your provider."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:768
+#: ../src/applet-device-gsm.c:834
 msgid "Sending unlock code..."
 msgstr "Sending unlock codeâ"
 
-#: ../src/applet-device-gsm.c:831
+#: ../src/applet-device-gsm.c:897
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN unlock required"
 
-#: ../src/applet-device-gsm.c:832
+#: ../src/applet-device-gsm.c:898
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN Unlock Required"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:834
+#: ../src/applet-device-gsm.c:900
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -234,25 +246,25 @@ msgstr ""
 "used."
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:836
+#: ../src/applet-device-gsm.c:902
 msgid "PIN code:"
 msgstr "PIN code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:840
+#: ../src/applet-device-gsm.c:906
 msgid "Show PIN code"
 msgstr "Show PIN code"
 
-#: ../src/applet-device-gsm.c:843
+#: ../src/applet-device-gsm.c:909
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK unlock required"
 
-#: ../src/applet-device-gsm.c:844
+#: ../src/applet-device-gsm.c:910
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK Unlock Required"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:846
+#: ../src/applet-device-gsm.c:912
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -262,25 +274,29 @@ msgstr ""
 "used."
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:848
+#: ../src/applet-device-gsm.c:914
 msgid "PUK code:"
 msgstr "PUK code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:851
+#: ../src/applet-device-gsm.c:917
 msgid "New PIN code:"
 msgstr "New PIN code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:853
+#: ../src/applet-device-gsm.c:919
 msgid "Re-enter new PIN code:"
 msgstr "Re-enter new PIN code:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:858
+#: ../src/applet-device-gsm.c:924
 msgid "Show PIN/PUK codes"
 msgstr "Show PIN/PUK codes"
 
+#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
+msgid "GSM network."
+msgstr "GSM network."
+
 #: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
@@ -304,7 +320,7 @@ msgid "Wired Network"
 msgstr "Wired Network"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
 msgid "disconnected"
 msgstr "disconnected"
 
@@ -342,99 +358,99 @@ msgstr "Wired network connection '%s' active"
 msgid "DSL authentication"
 msgstr "DSL authentication"
 
-#: ../src/applet-device-wifi.c:89
+#: ../src/applet-device-wifi.c:97
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "_Connect to Hidden Wireless Networkâ"
 
-#: ../src/applet-device-wifi.c:142
+#: ../src/applet-device-wifi.c:150
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Networkâ"
 
-#: ../src/applet-device-wifi.c:226
+#: ../src/applet-device-wifi.c:294
 msgid "(none)"
 msgstr "(none)"
 
-#: ../src/applet-device-wifi.c:795
+#: ../src/applet-device-wifi.c:803
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "Wireless Networks (%s)"
 
-#: ../src/applet-device-wifi.c:797
+#: ../src/applet-device-wifi.c:805
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "Wireless Network (%s)"
 
 #
-#: ../src/applet-device-wifi.c:799
+#: ../src/applet-device-wifi.c:807
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../src/applet-device-wifi.c:832
+#: ../src/applet-device-wifi.c:840
 msgid "wireless is disabled"
 msgstr "wireless is disabled"
 
-#: ../src/applet-device-wifi.c:833
+#: ../src/applet-device-wifi.c:841
 msgid "wireless is disabled by hardware switch"
 msgstr "wireless is disabled by hardware switch"
 
-#: ../src/applet-device-wifi.c:894
+#: ../src/applet-device-wifi.c:902
 msgid "More networks"
 msgstr "More networks"
 
 #
-#: ../src/applet-device-wifi.c:1073
+#: ../src/applet-device-wifi.c:1081
 msgid "Wireless Networks Available"
 msgstr "Wireless Networks Available"
 
 #
-#: ../src/applet-device-wifi.c:1075
+#: ../src/applet-device-wifi.c:1083
 msgid "Click on this icon to connect to a wireless network"
 msgstr "Click on this icon to connect to a wireless network"
 
-#: ../src/applet-device-wifi.c:1076
+#: ../src/applet-device-wifi.c:1084
 msgid "Use the network menu to connect to a wireless network"
 msgstr "Use the network menu to connect to a wireless network"
 
-#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
+#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
 msgid "Don't show this message again"
 msgstr "Don't show this message again"
 
 #
-#: ../src/applet-device-wifi.c:1271
+#: ../src/applet-device-wifi.c:1279
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "You are now connected to the wireless network '%s'."
 
-#: ../src/applet-device-wifi.c:1302
+#: ../src/applet-device-wifi.c:1310
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Preparing wireless network connection '%s'â"
 
-#: ../src/applet-device-wifi.c:1305
+#: ../src/applet-device-wifi.c:1313
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "Configuring wireless network connection '%s'â"
 
 #
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1316
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "User authentication required for wireless network '%s'â"
 
 #
-#: ../src/applet-device-wifi.c:1311
+#: ../src/applet-device-wifi.c:1319
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Requesting a wireless network address for '%s'â"
 
-#: ../src/applet-device-wifi.c:1332
+#: ../src/applet-device-wifi.c:1340
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Wireless network connection '%s' active: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1337
+#: ../src/applet-device-wifi.c:1345
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "Wireless network connection '%s' active"
@@ -466,8 +482,8 @@ msgstr "Error displaying connection information:"
 
 #: ../src/applet-dialogs.c:108
 #: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/wireless-dialog.c:946
-#: ../src/wireless-security/wireless-security.c:392
+#: ../src/libnm-gtk/nm-wireless-dialog.c:949
+#: ../src/wireless-security/wireless-security.c:396
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -486,7 +502,7 @@ msgstr "WEP"
 
 #: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
 #: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/wireless-dialog.c:903
+#: ../src/libnm-gtk/nm-wireless-dialog.c:906
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
@@ -668,11 +684,11 @@ msgstr "Mobile broadband network password"
 msgid "A password is required to connect to '%s'."
 msgstr "A password is required to connect to '%s'."
 
-#: ../src/applet-dialogs.c:854
+#: ../src/applet-dialogs.c:858
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet.c:894
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -683,7 +699,7 @@ msgstr ""
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -692,7 +708,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 
-#: ../src/applet.c:900
+#: ../src/applet.c:996
 #, c-format
 msgid ""
 "\n"
@@ -703,7 +719,7 @@ msgstr ""
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 
-#: ../src/applet.c:903
+#: ../src/applet.c:999
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +728,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet.c:906
+#: ../src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +737,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 
-#: ../src/applet.c:909
+#: ../src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -730,7 +746,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 
-#: ../src/applet.c:912
+#: ../src/applet.c:1008
 #, c-format
 msgid ""
 "\n"
@@ -739,7 +755,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 
-#: ../src/applet.c:915
+#: ../src/applet.c:1011
 #, c-format
 msgid ""
 "\n"
@@ -748,7 +764,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 
-#: ../src/applet.c:922
+#: ../src/applet.c:1018
 #, c-format
 msgid ""
 "\n"
@@ -757,7 +773,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed."
 
-#: ../src/applet.c:940
+#: ../src/applet.c:1036
 #, c-format
 msgid ""
 "\n"
@@ -768,7 +784,7 @@ msgstr ""
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:943
+#: ../src/applet.c:1039
 #, c-format
 msgid ""
 "\n"
@@ -777,7 +793,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 
-#: ../src/applet.c:949
+#: ../src/applet.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -786,15 +802,15 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:1079
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
+#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
 msgid "VPN Connection Failed"
 msgstr "VPN Connection Failed"
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:1150
 #, c-format
 msgid ""
 "\n"
@@ -807,7 +823,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:1153
 #, c-format
 msgid ""
 "\n"
@@ -820,140 +836,140 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1377
+#: ../src/applet.c:1473
 msgid "device not ready (firmware missing)"
 msgstr "device not ready (firmware missing)"
 
-#: ../src/applet.c:1379
+#: ../src/applet.c:1475
 msgid "device not ready"
 msgstr "device not ready"
 
-#: ../src/applet.c:1405
+#: ../src/applet.c:1501
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/applet.c:1419
+#: ../src/applet.c:1515
 msgid "device not managed"
 msgstr "device not managed"
 
-#: ../src/applet.c:1463
+#: ../src/applet.c:1559
 msgid "No network devices available"
 msgstr "No network devices available"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1647
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1608
+#: ../src/applet.c:1704
 msgid "_Configure VPN..."
 msgstr "_Configure VPNâ"
 
-#: ../src/applet.c:1612
+#: ../src/applet.c:1708
 msgid "_Disconnect VPN"
 msgstr "_Disconnect VPN"
 
-#: ../src/applet.c:1710
+#: ../src/applet.c:1806
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not runningâ"
 
-#: ../src/applet.c:1715 ../src/applet.c:2508
+#: ../src/applet.c:1811 ../src/applet.c:2604
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1936
+#: ../src/applet.c:2032
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1945
+#: ../src/applet.c:2041
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1954
+#: ../src/applet.c:2050
 msgid "Enable _Mobile Broadband"
 msgstr "Enable _Mobile Broadband"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:1963
+#: ../src/applet.c:2059
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Enable WiMA_X Mobile Broadband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1974
+#: ../src/applet.c:2070
 msgid "Enable N_otifications"
 msgstr "Enable N_otifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1985
+#: ../src/applet.c:2081
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1995
+#: ../src/applet.c:2091
 msgid "Edit Connections..."
 msgstr "Edit Connectionsâ"
 
 #. Help item
-#: ../src/applet.c:2009
+#: ../src/applet.c:2105
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../src/applet.c:2018
+#: ../src/applet.c:2114
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2195
+#: ../src/applet.c:2291
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../src/applet.c:2196
+#: ../src/applet.c:2292
 msgid "The network connection has been disconnected."
 msgstr "The network connection has been disconnected."
 
-#: ../src/applet.c:2377
+#: ../src/applet.c:2473
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparing network connection '%s'â"
 
-#: ../src/applet.c:2380
+#: ../src/applet.c:2476
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "User authentication required for network connection '%s'â"
 
-#: ../src/applet.c:2386
+#: ../src/applet.c:2482
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Network connection '%s' active"
 
-#: ../src/applet.c:2464
+#: ../src/applet.c:2560
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starting VPN connection '%s'â"
 
-#: ../src/applet.c:2467
+#: ../src/applet.c:2563
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "User authentication required for VPN connection '%s'â"
 
 #
-#: ../src/applet.c:2470
+#: ../src/applet.c:2566
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Requesting a VPN address for '%s'â"
 
-#: ../src/applet.c:2473
+#: ../src/applet.c:2569
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN connection '%s' active"
 
-#: ../src/applet.c:2512
+#: ../src/applet.c:2608
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:3161
+#: ../src/applet.c:3258
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
@@ -961,10 +977,6 @@ msgstr "NetworkManager Applet"
 msgid "_Unlock"
 msgstr "_Unlock"
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "label"
-msgstr "label"
-
 #: ../src/info.ui.h:1
 msgid "Active Network Connections"
 msgstr "Active Network Connections"
@@ -973,41 +985,19 @@ msgstr "Active Network Connections"
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/wifi.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../src/wifi.ui.h:2
-msgid "Co_nnection:"
-msgstr "Co_nnection:"
-
-#
-#: ../src/wifi.ui.h:3
-msgid "Wireless _adapter:"
-msgstr "Wireless _adapter:"
-
-#: ../src/wifi.ui.h:4 ../src/wired-8021x.ui.h:2
-msgid "_Network name:"
-msgstr "_Network name:"
-
-#
-#: ../src/wifi.ui.h:5
-msgid "_Wireless security:"
-msgstr "_Wireless security:"
-
 #: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
 msgid "Wired 802.1X authentication"
 msgstr "Wired 802.1X authentication"
 
+#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
+msgid "_Network name:"
+msgstr "_Network name:"
+
 #: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "automatic"
 
-#: ../src/connection-editor/ce-page.c:294
+#: ../src/connection-editor/ce-page.c:305
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Failed to update connection secrets due to an unknown error."
 
@@ -1080,7 +1070,7 @@ msgstr "Addresses"
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 #: ../src/connection-editor/ce-page-wired.ui.h:7
 #: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Automatic"
 msgstr "Automatic"
@@ -1119,8 +1109,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
 #: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:163
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manual"
 
@@ -1130,8 +1120,8 @@ msgstr "Require IPv4 addressing for this connection to complete"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:11
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip4.c:187
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Shared to other computers"
 
@@ -1347,38 +1337,29 @@ msgstr ""
 "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:14
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_Cloned MAC address:"
 msgstr "_Cloned MAC address:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Device MAC address:"
 msgstr "_Device MAC address:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
+#: ../src/connection-editor/ce-page-wired.ui.h:16
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Speed:"
 msgstr "_Speed:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "bytes"
 msgstr "bytes"
 
@@ -1414,7 +1395,7 @@ msgstr "M_ode:"
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 msgid ""
 "This option locks this connection to the wireless access point (AP) "
 "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -1422,23 +1403,23 @@ msgstr ""
 "This option locks this connection to the wireless access point (AP) "
 "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "mW"
 msgstr "mW"
 
@@ -1499,6 +1480,14 @@ msgstr "_MSCHAP"
 msgid "_PAP"
 msgstr "_PAP"
 
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../src/connection-editor/ce-vpn-wizard.ui.h:2
 msgid "Choose a VPN Connection Type"
 msgstr "Choose a VPN Connection Type"
@@ -1517,150 +1506,150 @@ msgstr ""
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:505
-#: ../src/connection-editor/ip6-routes-dialog.c:463
-#: ../src/connection-editor/page-ip4.c:733
-#: ../src/connection-editor/page-ip6.c:718
+#: ../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 "Address"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:521
-#: ../src/connection-editor/page-ip4.c:750
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/page-ip4.c:918
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:537
-#: ../src/connection-editor/ip6-routes-dialog.c:495
-#: ../src/connection-editor/page-ip4.c:767
-#: ../src/connection-editor/page-ip6.c:752
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip4.c:935
+#: ../src/connection-editor/page-ip6.c:901
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:553
-#: ../src/connection-editor/ip6-routes-dialog.c:511
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:479
-#: ../src/connection-editor/page-ip6.c:735
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip6.c:884
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:139
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1448
+#: ../src/connection-editor/nm-connection-list.c:1482
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "Could not load DSL user interface."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:231
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL connection %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
 msgstr "Automatic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:127
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatic (VPN) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (PPP)"
 msgstr "Automatic (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (PPP) addresses only"
 msgstr "Automatic (PPP) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:141
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatic (PPPoE) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:143
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:144
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:175
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Link-Local Only"
 
-#: ../src/connection-editor/page-ip4.c:191
+#: ../src/connection-editor/page-ip4.c:197
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/connection-editor/page-ip4.c:699
+#: ../src/connection-editor/page-ip4.c:832
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editing IPv4 routes for %s"
 
-#: ../src/connection-editor/page-ip4.c:810
+#: ../src/connection-editor/page-ip4.c:982
 msgid "IPv4 Settings"
 msgstr "IPv4 Settings"
 
-#: ../src/connection-editor/page-ip4.c:812
+#: ../src/connection-editor/page-ip4.c:984
 msgid "Could not load IPv4 user interface."
 msgstr "Could not load IPv4 user interface."
 
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatic, addresses only"
 
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 #: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../src/connection-editor/page-ip6.c:684
+#: ../src/connection-editor/page-ip6.c:798
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editing IPv6 routes for %s"
 
-#: ../src/connection-editor/page-ip6.c:793
+#: ../src/connection-editor/page-ip6.c:946
 msgid "IPv6 Settings"
 msgstr "IPv6 Settings"
 
-#: ../src/connection-editor/page-ip6.c:795
+#: ../src/connection-editor/page-ip6.c:948
 msgid "Could not load IPv6 user interface."
 msgstr "Could not load IPv6 user interface."
 
-#: ../src/connection-editor/page-mobile.c:374
+#: ../src/connection-editor/page-mobile.c:381
 msgid "Could not load mobile broadband user interface."
 msgstr "Could not load mobile broadband user interface."
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:398
 msgid "Unsupported mobile broadband connection type."
 msgstr "Unsupported mobile broadband connection type."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:632
+#: ../src/connection-editor/page-mobile.c:639
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Select Mobile Broadband Provider Type"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:674
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1668,11 +1657,11 @@ msgstr ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 
-#: ../src/connection-editor/page-mobile.c:664
+#: ../src/connection-editor/page-mobile.c:679
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:671
+#: ../src/connection-editor/page-mobile.c:686
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 
@@ -1681,7 +1670,7 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:232
+#: ../src/wireless-security/eap-method-ttls.c:230
 msgid "PAP"
 msgstr "PAP"
 
@@ -1691,13 +1680,13 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:248
-#: ../src/wireless-security/eap-method-ttls.c:264
+#: ../src/wireless-security/eap-method-peap.c:246
+#: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/wireless-security/eap-method-ttls.c:247
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -1711,125 +1700,134 @@ msgstr "none"
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editing PPP authentication methods for %s"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:283
 msgid "PPP Settings"
 msgstr "PPP Settings"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:285
 msgid "Could not load PPP user interface."
 msgstr "Could not load PPP user interface."
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:109
 #: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1444
+#: ../src/connection-editor/nm-connection-list.c:1478
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:109
+#: ../src/connection-editor/page-vpn.c:111
 msgid "Could not load VPN user interface."
 msgstr "Could not load VPN user interface."
 
-#: ../src/connection-editor/page-vpn.c:124
+#: ../src/connection-editor/page-vpn.c:126
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Could not find VPN plugin service for '%s'."
 
-#: ../src/connection-editor/page-vpn.c:218
-#: ../src/connection-editor/nm-connection-list.c:881
+#: ../src/connection-editor/page-vpn.c:201
+#: ../src/connection-editor/nm-connection-list.c:884
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN connection %d"
 
-#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/page-wired.c:88
+#: ../src/connection-editor/page-wireless.c:93
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wired.c:267
 #: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1432
+#: ../src/connection-editor/nm-connection-list.c:1466
 msgid "Wired"
 msgstr "Wired"
 
-#: ../src/connection-editor/page-wired.c:213
+#: ../src/connection-editor/page-wired.c:269
 msgid "Could not load wired user interface."
 msgstr "Could not load wired user interface."
 
-#: ../src/connection-editor/page-wired.c:348
+#: ../src/connection-editor/page-wired.c:444
 #, c-format
 msgid "Wired connection %d"
 msgstr "Wired connection %d"
 
 #
-#: ../src/connection-editor/page-wired-security.c:114
+#: ../src/connection-editor/page-wired-security.c:116
 msgid "802.1x Security"
 msgstr "802.1x Security"
 
-#: ../src/connection-editor/page-wired-security.c:116
+#: ../src/connection-editor/page-wired-security.c:118
 msgid "Could not load Wired Security security user interface."
 msgstr "Could not load Wired Security security user interface."
 
-#: ../src/connection-editor/page-wired-security.c:130
+#: ../src/connection-editor/page-wired-security.c:136
 msgid "Use 802.1X security for this connection"
 msgstr "Use 802.1X security for this connection"
 
-#: ../src/connection-editor/page-wireless.c:147
-#: ../src/connection-editor/page-wireless.c:151
-#: ../src/connection-editor/page-wireless.c:172
+#: ../src/connection-editor/page-wireless.c:166
+#: ../src/connection-editor/page-wireless.c:170
+#: ../src/connection-editor/page-wireless.c:191
 #, c-format
 msgid "default"
 msgstr "default"
 
-#: ../src/connection-editor/page-wireless.c:176
+#: ../src/connection-editor/page-wireless.c:195
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/page-wireless.c:452
 #: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1436
+#: ../src/connection-editor/nm-connection-list.c:1470
 msgid "Wireless"
 msgstr "Wireless"
 
-#: ../src/connection-editor/page-wireless.c:398
+#: ../src/connection-editor/page-wireless.c:454
 msgid "Could not load WiFi user interface."
 msgstr "Could not load WiFi user interface."
 
-#: ../src/connection-editor/page-wireless.c:562
+#: ../src/connection-editor/page-wireless.c:658
 #, c-format
 msgid "Wireless connection %d"
 msgstr "Wireless connection %d"
 
 #: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/wireless-dialog.c:920
+#: ../src/libnm-gtk/nm-wireless-dialog.c:923
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
 #: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/wireless-dialog.c:929
+#: ../src/libnm-gtk/nm-wireless-dialog.c:932
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
 #: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/wireless-dialog.c:959
+#: ../src/libnm-gtk/nm-wireless-dialog.c:962
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
 #: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/wireless-dialog.c:973
+#: ../src/libnm-gtk/nm-wireless-dialog.c:976
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/wireless-dialog.c:987
+#: ../src/libnm-gtk/nm-wireless-dialog.c:990
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:359
+#: ../src/connection-editor/page-wireless-security.c:360
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr "Could not load WiFi security user interface; missing WiFi setting."
 
 #
-#: ../src/connection-editor/page-wireless-security.c:368
+#: ../src/connection-editor/page-wireless-security.c:370
 msgid "Wireless Security"
 msgstr "Wireless Security"
 
-#: ../src/connection-editor/page-wireless-security.c:370
+#: ../src/connection-editor/page-wireless-security.c:372
 msgid "Could not load WiFi security user interface."
 msgstr "Could not load WiFi security user interface."
 
@@ -1842,7 +1840,7 @@ msgstr "Editing %s"
 msgid "Editing un-named connection"
 msgstr "Editing un-named connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:294
+#: ../src/connection-editor/nm-connection-editor.c:288
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1850,23 +1848,23 @@ msgstr ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 
-#: ../src/connection-editor/nm-connection-editor.c:397
+#: ../src/connection-editor/nm-connection-editor.c:391
 msgid "Error creating connection editor dialog."
 msgstr "Error creating connection editor dialogue."
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:403
 msgid "_Save"
 msgstr "_Save"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:404
 msgid "Save any changes made to this connection."
 msgstr "Save any changes made to this connection."
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:405
 msgid "_Save..."
 msgstr "_Saveâ"
 
-#: ../src/connection-editor/nm-connection-editor.c:412
+#: ../src/connection-editor/nm-connection-editor.c:406
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Authenticate to save this connection for all users of this machine."
 
@@ -1954,13 +1952,13 @@ msgid "An unknown error occurred."
 msgstr "An unknown error occurred."
 
 #: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "Error initializing editor"
 msgstr "Error initialising editor"
 
 #: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:700
-#: ../src/connection-editor/nm-connection-list.c:867
+#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:870
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1976,25 +1974,25 @@ msgstr "Could not create new connection"
 msgid "Could not edit new connection"
 msgstr "Could not edit new connection"
 
-#: ../src/connection-editor/nm-connection-list.c:714
+#: ../src/connection-editor/nm-connection-list.c:717
 msgid "Could not edit connection"
 msgstr "Could not edit connection"
 
-#: ../src/connection-editor/nm-connection-list.c:744
+#: ../src/connection-editor/nm-connection-list.c:747
 msgid "Connection delete failed"
 msgstr "Connection delete failed"
 
-#: ../src/connection-editor/nm-connection-list.c:776
+#: ../src/connection-editor/nm-connection-list.c:779
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Are you sure you wish to delete the connection %s?"
 
-#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/nm-connection-list.c:914
 #: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../src/connection-editor/nm-connection-list.c:913
+#: ../src/connection-editor/nm-connection-list.c:916
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2004,74 +2002,74 @@ msgstr ""
 "\n"
 "Error: no VPN service type."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "Could not edit imported connection"
 msgstr "Could not edit imported connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1069
+#: ../src/connection-editor/nm-connection-list.c:1099
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:1081
+#: ../src/connection-editor/nm-connection-list.c:1111
 msgid "Last Used"
 msgstr "Last Used"
 
-#: ../src/connection-editor/nm-connection-list.c:1197
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "No VPN plugin available. Please install one to enable this button."
 msgstr "No VPN plugin available. Please install one to enable this button."
 
-#: ../src/connection-editor/nm-connection-list.c:1208
+#: ../src/connection-editor/nm-connection-list.c:1238
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/connection-editor/nm-connection-list.c:1209
+#: ../src/connection-editor/nm-connection-list.c:1239
 msgid "Edit the selected connection"
 msgstr "Edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1210
+#: ../src/connection-editor/nm-connection-list.c:1240
 msgid "_Edit..."
 msgstr "_Editâ"
 
-#: ../src/connection-editor/nm-connection-list.c:1211
+#: ../src/connection-editor/nm-connection-list.c:1241
 msgid "Authenticate to edit the selected connection"
 msgstr "Authenticate to edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1226
+#: ../src/connection-editor/nm-connection-list.c:1256
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/connection-editor/nm-connection-list.c:1227
+#: ../src/connection-editor/nm-connection-list.c:1257
 msgid "Delete the selected connection"
 msgstr "Delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1228
+#: ../src/connection-editor/nm-connection-list.c:1258
 msgid "_Delete..."
 msgstr "_Deleteâ"
 
-#: ../src/connection-editor/nm-connection-list.c:1229
+#: ../src/connection-editor/nm-connection-list.c:1259
 msgid "Authenticate to delete the selected connection"
 msgstr "Authenticate to delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1504
+#: ../src/connection-editor/nm-connection-list.c:1538
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1505
+#: ../src/connection-editor/nm-connection-list.c:1539
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Don't know how to create '%s' connections"
 
-#: ../src/connection-editor/nm-connection-list.c:1559
-#: ../src/connection-editor/nm-connection-list.c:1571
+#: ../src/connection-editor/nm-connection-list.c:1594
+#: ../src/connection-editor/nm-connection-list.c:1606
 msgid "Error editing connection"
 msgstr "Error editing connection"
 
-#: ../src/connection-editor/nm-connection-list.c:1560
+#: ../src/connection-editor/nm-connection-list.c:1595
 #, c-format
 msgid "Don't know how to edit '%s' connections"
 msgstr "Don't know how to edit '%s' connections"
 
-#: ../src/connection-editor/nm-connection-list.c:1572
+#: ../src/connection-editor/nm-connection-list.c:1607
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Did not find a connection with UUID '%s'"
@@ -2126,61 +2124,61 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "Export VPN connectionâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:218
+#: ../src/gnome-bluetooth/bt-widget.c:220
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "Failed to create PAN connection: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:223
-#: ../src/gnome-bluetooth/bt-widget.c:491
+#: ../src/gnome-bluetooth/bt-widget.c:225
+#: ../src/gnome-bluetooth/bt-widget.c:493
 msgid "Your phone is now ready to use!"
 msgstr "Your phone is now ready to use!"
 
-#: ../src/gnome-bluetooth/bt-widget.c:247
+#: ../src/gnome-bluetooth/bt-widget.c:249
 #, c-format
 msgid "%s Network"
 msgstr "%s Network"
 
-#: ../src/gnome-bluetooth/bt-widget.c:373
+#: ../src/gnome-bluetooth/bt-widget.c:375
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:486
+#: ../src/gnome-bluetooth/bt-widget.c:488
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Failed to create DUN connection: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:509
+#: ../src/gnome-bluetooth/bt-widget.c:511
 msgid "Mobile wizard was canceled"
 msgstr "Mobile wizard was cancelled"
 
-#: ../src/gnome-bluetooth/bt-widget.c:518
+#: ../src/gnome-bluetooth/bt-widget.c:520
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Unknown phone device type (not GSM or CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:712
-#: ../src/gnome-bluetooth/bt-widget.c:718
+#: ../src/gnome-bluetooth/bt-widget.c:714
+#: ../src/gnome-bluetooth/bt-widget.c:720
 msgid "failed to connect to the phone."
 msgstr "failed to connect to the phone."
 
-#: ../src/gnome-bluetooth/bt-widget.c:751
+#: ../src/gnome-bluetooth/bt-widget.c:753
 msgid "unexpectedly disconnected from the phone."
 msgstr "unexpectedly disconnected from the phone."
 
-#: ../src/gnome-bluetooth/bt-widget.c:760
+#: ../src/gnome-bluetooth/bt-widget.c:762
 msgid "timed out detecting phone details."
 msgstr "timed out detecting phone details."
 
-#: ../src/gnome-bluetooth/bt-widget.c:772
+#: ../src/gnome-bluetooth/bt-widget.c:774
 msgid "Detecting phone configuration..."
 msgstr "Detecting phone configurationâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:838
+#: ../src/gnome-bluetooth/bt-widget.c:840
 msgid "could not find the Bluetooth device."
 msgstr "could not find the Bluetooth device."
 
-#: ../src/gnome-bluetooth/bt-widget.c:971
+#: ../src/gnome-bluetooth/bt-widget.c:975
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2188,150 +2186,52 @@ msgstr ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1003
+#: ../src/gnome-bluetooth/bt-widget.c:1007
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1013
+#: ../src/gnome-bluetooth/bt-widget.c:1017
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
+#: ../src/gnome-bluetooth/bt-widget.c:1026
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1085
+#: ../src/gnome-bluetooth/bt-widget.c:1093
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "Use your mobile phone as a network device (PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1094
+#: ../src/gnome-bluetooth/bt-widget.c:1102
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Access the Internet using your mobile phone (DUN)"
 
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "Usage:"
-
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (http://projects.gnome.org/";
-"NetworkManager)."
-msgstr ""
-"This program is a component of NetworkManager (http://projects.gnome.org/";
-"NetworkManager)."
-
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
-msgstr ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
-
-#: ../src/mb-menu-item.c:57
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:61
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:63
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:65
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:67
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:69
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:71
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../src/mb-menu-item.c:109
-msgid "not enabled"
-msgstr "not enabled"
-
-#: ../src/mb-menu-item.c:115
-msgid "not registered"
-msgstr "not registered"
-
-#: ../src/mb-menu-item.c:133
-#, c-format
-msgid "Home network (%s)"
-msgstr "Home network (%s)"
-
-#: ../src/mb-menu-item.c:135
-#, c-format
-msgid "Home network"
-msgstr "Home network"
-
-#: ../src/mb-menu-item.c:143
-msgid "searching"
-msgstr "searching"
-
-#: ../src/mb-menu-item.c:146
-msgid "registration denied"
-msgstr "registration denied"
-
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s roaming)"
-
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (roaming)"
-
-#: ../src/mb-menu-item.c:162
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "Roaming network (%s)"
-
-#: ../src/mb-menu-item.c:164
-#, c-format
-msgid "Roaming network"
-msgstr "Roaming network"
-
-#: ../src/utils/mobile-wizard.c:196
+#: ../src/libnm-gtk/nm-mobile-wizard.c:198
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Your mobile broadband connection is configured with the following settings:"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnm-gtk/nm-mobile-wizard.c:205
 msgid "Your Device:"
 msgstr "Your Device:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:216
 msgid "Your Provider:"
 msgstr "Your Provider:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:227
 msgid "Your Plan:"
 msgstr "Your Plan:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../src/libnm-gtk/nm-mobile-wizard.c:252
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
@@ -2345,23 +2245,23 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../src/libnm-gtk/nm-mobile-wizard.c:264
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirm Mobile Broadband Settings"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnm-gtk/nm-mobile-wizard.c:325
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnm-gtk/nm-mobile-wizard.c:480
 msgid "_Select your plan:"
 msgstr "_Select your plan:"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:504
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Selected plan _APN (Access Point Name):"
 
-#: ../src/utils/mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:528
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2373,67 +2273,67 @@ msgstr ""
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:535
 msgid "Choose your Billing Plan"
 msgstr "Choose your Billing Plan"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:583
 msgid "My plan is not listed..."
 msgstr "My plan is not listedâ"
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../src/libnm-gtk/nm-mobile-wizard.c:740
 msgid "Select your provider from a _list:"
 msgstr "Select your provider from a _list:"
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/libnm-gtk/nm-mobile-wizard.c:753
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../src/libnm-gtk/nm-mobile-wizard.c:778
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "I can't find my provider and I wish to enter it _manually:"
 
-#: ../src/utils/mobile-wizard.c:737
+#: ../src/libnm-gtk/nm-mobile-wizard.c:789
 msgid "Provider:"
 msgstr "Provider:"
 
-#: ../src/utils/mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:813
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:819
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
 
-#: ../src/utils/mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:830
 msgid "Choose your Provider"
 msgstr "Choose your Provider"
 
-#: ../src/utils/mobile-wizard.c:1024
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
 msgid "Country or Region List:"
 msgstr "Country or Region List:"
 
-#: ../src/utils/mobile-wizard.c:1036
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
 msgid "Country or region"
 msgstr "Country or region"
 
-#: ../src/utils/mobile-wizard.c:1043
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
 msgid "My country is not listed"
 msgstr "My country is not listed"
 
-#: ../src/utils/mobile-wizard.c:1089
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
 msgid "Choose your Provider's Country or Region"
 msgstr "Choose your Provider's Country or Region"
 
-#: ../src/utils/mobile-wizard.c:1143
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: ../src/utils/mobile-wizard.c:1146
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: ../src/utils/mobile-wizard.c:1314
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2441,64 +2341,48 @@ msgstr ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "mobile (3G) network."
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
 msgid "You will need the following information:"
 msgstr "You will need the following information:"
 
-#: ../src/utils/mobile-wizard.c:1330
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
 msgid "Your broadband provider's name"
 msgstr "Your broadband provider's name"
 
-#: ../src/utils/mobile-wizard.c:1336
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
 msgid "Your broadband billing plan name"
 msgstr "Your broadband billing plan name"
 
-#: ../src/utils/mobile-wizard.c:1342
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(in some cases) Your broadband billing plan APN (Access Point Name)"
 
-#: ../src/utils/mobile-wizard.c:1369
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Create a connection for _this mobile broadband device:"
 
-#: ../src/utils/mobile-wizard.c:1384
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
 msgid "Any device"
 msgstr "Any device"
 
-#: ../src/utils/mobile-wizard.c:1397
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set up a Mobile Broadband Connection"
 
-#: ../src/utils/mobile-wizard.c:1561
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
 msgid "New Mobile Broadband Connection"
 msgstr "New Mobile Broadband Connection"
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "United Kingdom"
-
-#: ../src/utils/nmn-mobile-providers.c:510
-msgid "Default"
-msgstr "Default"
-
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-
-#: ../src/wireless-dialog.c:454
+#: ../src/libnm-gtk/nm-wireless-dialog.c:457
 msgid "New..."
 msgstr "Newâ"
 
-#: ../src/wireless-dialog.c:1074
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
 msgid "C_reate"
 msgstr "C_reate"
 
 #
-#: ../src/wireless-dialog.c:1152
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -2507,38 +2391,38 @@ msgstr ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 
-#: ../src/wireless-dialog.c:1154
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
 msgid "Wireless Network Authentication Required"
 msgstr "Wireless Network Authentication Required"
 
 #
-#: ../src/wireless-dialog.c:1156
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
 msgid "Authentication required by wireless network"
 msgstr "Authentication required by wireless network"
 
-#: ../src/wireless-dialog.c:1161
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Networkâ"
 
 #
-#: ../src/wireless-dialog.c:1163
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
 msgid "New wireless network"
 msgstr "New wireless network"
 
-#: ../src/wireless-dialog.c:1164
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Enter a name for the wireless network you wish to create."
 
-#: ../src/wireless-dialog.c:1166
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
 msgid "Connect to Hidden Wireless Network"
 msgstr "Connect to Hidden Wireless Network"
 
 #
-#: ../src/wireless-dialog.c:1168
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
 msgid "Hidden wireless network"
 msgstr "Hidden wireless network"
 
-#: ../src/wireless-dialog.c:1169
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
@@ -2546,6 +2430,130 @@ msgstr ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "Co_nnection:"
+msgstr "Co_nnection:"
+
+#
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "Wireless _adapter:"
+msgstr "Wireless _adapter:"
+
+#
+#: ../src/libnm-gtk/wifi.ui.h:5
+msgid "_Wireless security:"
+msgstr "_Wireless security:"
+
+#: ../src/main.c:73
+msgid "Usage:"
+msgstr "Usage:"
+
+#: ../src/main.c:75
+msgid ""
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
+msgstr ""
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
+
+#: ../src/main.c:76
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+
+#: ../src/mb-menu-item.c:57
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:61
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:63
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:65
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:67
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:69
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:71
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/mb-menu-item.c:109
+msgid "not enabled"
+msgstr "not enabled"
+
+#: ../src/mb-menu-item.c:115
+msgid "not registered"
+msgstr "not registered"
+
+#: ../src/mb-menu-item.c:133
+#, c-format
+msgid "Home network (%s)"
+msgstr "Home network (%s)"
+
+#: ../src/mb-menu-item.c:135
+#, c-format
+msgid "Home network"
+msgstr "Home network"
+
+#: ../src/mb-menu-item.c:143
+msgid "searching"
+msgstr "searching"
+
+#: ../src/mb-menu-item.c:146
+msgid "registration denied"
+msgstr "registration denied"
+
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#, c-format
+msgid "%s (%s roaming)"
+msgstr "%s (%s roaming)"
+
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (roaming)"
+
+#: ../src/mb-menu-item.c:162
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "Roaming network (%s)"
+
+#: ../src/mb-menu-item.c:164
+#, c-format
+msgid "Roaming network"
+msgstr "Roaming network"
+
+#: ../src/utils/nmn-mobile-providers.c:531
+msgid "Default"
+msgstr "Default"
+
+#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+
 #: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr "No Certificate Authority certificate chosen"
@@ -2564,16 +2572,16 @@ msgstr ""
 msgid "Choose CA Certificate"
 msgstr "Choose CA Certificate"
 
-#: ../src/wireless-security/eap-method.c:627
+#: ../src/wireless-security/eap-method.c:648
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:630
+#: ../src/wireless-security/eap-method.c:651
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/wireless-security.c:368
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:372
 msgid "MD5"
 msgstr "MD5"
 
@@ -2581,9 +2589,9 @@ msgstr "MD5"
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:349
-#: ../src/wireless-security/eap-method-tls.c:419
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-peap.c:350
+#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Choose a Certificate Authority certificateâ"
 
@@ -2619,11 +2627,11 @@ msgstr "_PEAP version:"
 msgid "As_k for this password every time"
 msgstr "As_k for this password every time"
 
-#: ../src/wireless-security/eap-method-tls.c:250
+#: ../src/wireless-security/eap-method-tls.c:246
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: ../src/wireless-security/eap-method-tls.c:253
+#: ../src/wireless-security/eap-method-tls.c:249
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -2637,11 +2645,11 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../src/wireless-security/eap-method-tls.c:410
 msgid "Choose your personal certificate..."
 msgstr "Choose your personal certificateâ"
 
-#: ../src/wireless-security/eap-method-tls.c:425
+#: ../src/wireless-security/eap-method-tls.c:422
 msgid "Choose your private key..."
 msgstr "Choose your private keyâ"
 
@@ -2673,15 +2681,15 @@ msgstr "No"
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/wireless-security/wireless-security.c:380
+#: ../src/wireless-security/wireless-security.c:384
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:404
+#: ../src/wireless-security/wireless-security.c:408
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../src/wireless-security/wireless-security.c:415
+#: ../src/wireless-security/wireless-security.c:419
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -2727,6 +2735,12 @@ msgstr "WEP inde_x:"
 msgid "_Key:"
 msgstr "_Key:"
 
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "United Kingdom"
+#~ msgstr "United Kingdom"
+
 #~ msgid "Network Manager"
 #~ msgstr "Network Manager"
 
@@ -2751,9 +2765,6 @@ msgstr "_Key:"
 #~ msgid "CDMA Connections"
 #~ msgstr "CDMA Connections"
 
-#~ msgid "CDMA Network"
-#~ msgstr "CDMA Network"
-
 #~ msgid "Running PPP on device %s..."
 #~ msgstr "Running PPP on device %s..."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]