[network-manager-applet] Updated British English translation



commit bf02cb0ca1d8f60a7931db05fa91a2a6bacb53b8
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Wed Sep 5 14:50:27 2012 +0100

    Updated British English translation

 po/en_GB.po |  610 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 332 insertions(+), 278 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 9969806..bd1bfa5 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: 2012-04-13 13:14+0100\n"
-"PO-Revision-Date: 2012-04-13 13:15+0100\n"
+"POT-Creation-Date: 2012-09-05 14:49+0100\n"
+"PO-Revision-Date: 2012-09-05 14:50+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -26,83 +26,114 @@ msgstr "Network"
 msgid "Manage your network connections"
 msgstr "Manage your network connections"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Network Connections"
+
+#
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Manage and change your network connection settings"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Disable connected notifications"
 
-#: ../nm-applet.schemas.in.h:2
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr ""
-"Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Set this to true to disable notifications when connecting to a network."
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "Disable disconnected notifications"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Set this to true to disable notifications when disconnecting from a network."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr "Disable VPN notifications"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
 msgstr "Suppress networks available notifications"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
+"Set this to true to disable notifications when wireless networks are "
 "available."
 msgstr ""
-"Set this to TRUE to disable notifications when wireless networks are "
+"Set this to true to disable notifications when wireless networks are "
 "available."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Stamp"
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Used to determine whether settings should be migrated to a new version."
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "Disable WiFi Create"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Network Connections"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Ignore CA certificate"
+msgstr "Ignore CA certificate"
 
-#
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "Manage and change your network connection settings"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:864 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "Available"
 
 #
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-gsm.c:486 ../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:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1268 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Connection Established"
 
@@ -110,50 +141,50 @@ 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:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:526 ../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:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:529 ../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:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:532 ../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:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2504
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
+#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2500
 #, 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:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-gsm.c:553
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobile broadband connection '%s' active"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
 #: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobile Broadband (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
 #: ../src/connection-editor/page-mobile.c:379
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
 #: ../src/connection-editor/nm-connection-list.c:1510
@@ -161,87 +192,87 @@ msgid "Mobile Broadband"
 msgstr "Mobile Broadband"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:412
+#: ../src/applet-device-cdma.c:409
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "New Mobile Broadband (CDMA) connectionâ"
 
-#: ../src/applet-device-cdma.c:446
+#: ../src/applet-device-cdma.c:443
 msgid "You are now connected to the CDMA network."
 msgstr "You are now connected to the CDMA network."
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
 #: ../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:506 ../src/applet-device-gsm.c:553
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "roaming"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
 msgid "CDMA network."
 msgstr "CDMA network."
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
 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:1204
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
 msgid "You are now registered on a roaming network."
 msgstr "You are now registered on a roaming network."
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-gsm.c:211 ../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:459
+#: ../src/applet-device-gsm.c:457
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "New Mobile Broadband (GSM) connectionâ"
 
-#: ../src/applet-device-gsm.c:493
+#: ../src/applet-device-gsm.c:491
 msgid "You are now connected to the GSM network."
 msgstr "You are now connected to the GSM network."
 
-#: ../src/applet-device-gsm.c:654
+#: ../src/applet-device-gsm.c:652
 msgid "PIN code required"
 msgstr "PIN code required"
 
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-gsm.c:660
 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:783
+#: ../src/applet-device-gsm.c:781
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN code for SIM card '%s' on '%s'"
 
-#: ../src/applet-device-gsm.c:875
+#: ../src/applet-device-gsm.c:873
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Wrong PIN code; please contact your provider."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:896
 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:925
+#: ../src/applet-device-gsm.c:923
 msgid "Sending unlock code..."
 msgstr "Sending unlock codeâ"
 
-#: ../src/applet-device-gsm.c:988
+#: ../src/applet-device-gsm.c:986
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN unlock required"
 
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet-device-gsm.c:987
 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:991
+#: ../src/applet-device-gsm.c:989
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -251,25 +282,25 @@ msgstr ""
 "used."
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
+#: ../src/applet-device-gsm.c:991
 msgid "PIN code:"
 msgstr "PIN code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
+#: ../src/applet-device-gsm.c:995
 msgid "Show PIN code"
 msgstr "Show PIN code"
 
-#: ../src/applet-device-gsm.c:1000
+#: ../src/applet-device-gsm.c:998
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK unlock required"
 
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet-device-gsm.c:999
 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:1003
+#: ../src/applet-device-gsm.c:1001
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -279,26 +310,26 @@ msgstr ""
 "used."
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
+#: ../src/applet-device-gsm.c:1003
 msgid "PUK code:"
 msgstr "PUK code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
+#: ../src/applet-device-gsm.c:1006
 msgid "New PIN code:"
 msgstr "New PIN code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
+#: ../src/applet-device-gsm.c:1008
 msgid "Re-enter new PIN code:"
 msgstr "Re-enter new PIN code:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
+#: ../src/applet-device-gsm.c:1013
 msgid "Show PIN/PUK codes"
 msgstr "Show PIN/PUK codes"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
 msgid "GSM network."
 msgstr "GSM network."
 
@@ -325,7 +356,7 @@ msgid "Wired Network"
 msgstr "Wired Network"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1510
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
 msgid "disconnected"
 msgstr "disconnected"
 
@@ -367,109 +398,109 @@ msgstr "DSL authentication"
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "_Connect to Hidden Wireless Networkâ"
 
-#: ../src/applet-device-wifi.c:150
+#: ../src/applet-device-wifi.c:148
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Networkâ"
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:292
 msgid "(none)"
 msgstr "(none)"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:790
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "Wireless Networks (%s)"
 
-#: ../src/applet-device-wifi.c:794
+#: ../src/applet-device-wifi.c:792
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "Wireless Network (%s)"
 
 #
-#: ../src/applet-device-wifi.c:796
+#: ../src/applet-device-wifi.c:794
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../src/applet-device-wifi.c:829
+#: ../src/applet-device-wifi.c:827
 msgid "wireless is disabled"
 msgstr "wireless is disabled"
 
-#: ../src/applet-device-wifi.c:830
+#: ../src/applet-device-wifi.c:828
 msgid "wireless is disabled by hardware switch"
 msgstr "wireless is disabled by hardware switch"
 
-#: ../src/applet-device-wifi.c:891
+#: ../src/applet-device-wifi.c:889
 msgid "More networks"
 msgstr "More networks"
 
 #
-#: ../src/applet-device-wifi.c:1071
+#: ../src/applet-device-wifi.c:1068
 msgid "Wireless Networks Available"
 msgstr "Wireless Networks Available"
 
-#: ../src/applet-device-wifi.c:1072
+#: ../src/applet-device-wifi.c:1069
 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:1075 ../src/applet.c:926
+#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
 msgid "Don't show this message again"
 msgstr "Don't show this message again"
 
 #
-#: ../src/applet-device-wifi.c:1267
+#: ../src/applet-device-wifi.c:1263
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "You are now connected to the wireless network '%s'."
 
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1294
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Preparing wireless network connection '%s'â"
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1297
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "Configuring wireless network connection '%s'â"
 
 #
-#: ../src/applet-device-wifi.c:1304
+#: ../src/applet-device-wifi.c:1300
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "User authentication required for wireless network '%s'â"
 
 #
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1303
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Requesting a wireless network address for '%s'â"
 
-#: ../src/applet-device-wifi.c:1328
+#: ../src/applet-device-wifi.c:1324
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Wireless network connection '%s' active: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1333
+#: ../src/applet-device-wifi.c:1329
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "Wireless network connection '%s' active"
 
-#: ../src/applet-device-wifi.c:1381
+#: ../src/applet-device-wifi.c:1377
 msgid "Failed to activate connection"
 msgstr "Failed to activate connection"
 
-#: ../src/applet-device-wifi.c:1383 ../src/applet-device-wifi.c:1402
-#: ../src/applet.c:492 ../src/applet.c:536 ../src/applet.c:562
+#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1405
-#: ../src/applet.c:495 ../src/applet.c:565
+#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:493 ../src/applet.c:563
 msgid "Connection failure"
 msgstr "Connection failure"
 
-#: ../src/applet-device-wifi.c:1400
+#: ../src/applet-device-wifi.c:1396
 msgid "Failed to add new connection"
 msgstr "Failed to add new connection"
 
@@ -735,23 +766,23 @@ msgstr "A password is required to connect to '%s'."
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet.c:490
+#: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "Failed to add/activate connection"
 
-#: ../src/applet.c:534
+#: ../src/applet.c:532
 msgid "Device disconnect failed"
 msgstr "Device disconnect failed"
 
-#: ../src/applet.c:539
+#: ../src/applet.c:537
 msgid "Disconnect failure"
 msgstr "Disconnect failure"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:558
 msgid "Connection activation failed"
 msgstr "Connection activation failed"
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -762,7 +793,7 @@ msgstr ""
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:1016
 #, c-format
 msgid ""
 "\n"
@@ -771,7 +802,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 
-#: ../src/applet.c:1021
+#: ../src/applet.c:1019
 #, c-format
 msgid ""
 "\n"
@@ -782,7 +813,7 @@ msgstr ""
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -791,7 +822,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet.c:1027
+#: ../src/applet.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -800,7 +831,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 
-#: ../src/applet.c:1030
+#: ../src/applet.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -809,7 +840,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 
-#: ../src/applet.c:1033
+#: ../src/applet.c:1031
 #, c-format
 msgid ""
 "\n"
@@ -818,7 +849,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 
-#: ../src/applet.c:1036
+#: ../src/applet.c:1034
 #, c-format
 msgid ""
 "\n"
@@ -827,7 +858,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -836,7 +867,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:1059
 #, c-format
 msgid ""
 "\n"
@@ -847,7 +878,7 @@ msgstr ""
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -856,7 +887,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:1068
 #, c-format
 msgid ""
 "\n"
@@ -865,7 +896,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected."
 
-#: ../src/applet.c:1100
+#: ../src/applet.c:1098
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -876,19 +907,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1102
+#: ../src/applet.c:1100
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN connection has been successfully established.\n"
 
-#: ../src/applet.c:1104
+#: ../src/applet.c:1102
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:1110 ../src/applet.c:1118 ../src/applet.c:1168
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
 msgid "VPN Connection Failed"
 msgstr "VPN Connection Failed"
 
-#: ../src/applet.c:1175
+#: ../src/applet.c:1173
 #, c-format
 msgid ""
 "\n"
@@ -901,7 +932,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1178
+#: ../src/applet.c:1176
 #, c-format
 msgid ""
 "\n"
@@ -914,140 +945,140 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1498
+#: ../src/applet.c:1496
 msgid "device not ready (firmware missing)"
 msgstr "device not ready (firmware missing)"
 
-#: ../src/applet.c:1500
+#: ../src/applet.c:1498
 msgid "device not ready"
 msgstr "device not ready"
 
-#: ../src/applet.c:1526
+#: ../src/applet.c:1524
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/applet.c:1540
+#: ../src/applet.c:1538
 msgid "device not managed"
 msgstr "device not managed"
 
-#: ../src/applet.c:1584
+#: ../src/applet.c:1582
 msgid "No network devices available"
 msgstr "No network devices available"
 
-#: ../src/applet.c:1672
+#: ../src/applet.c:1670
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1729
+#: ../src/applet.c:1727
 msgid "_Configure VPN..."
 msgstr "_Configure VPNâ"
 
-#: ../src/applet.c:1733
+#: ../src/applet.c:1731
 msgid "_Disconnect VPN"
 msgstr "_Disconnect VPN"
 
-#: ../src/applet.c:1831
+#: ../src/applet.c:1825
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not runningâ"
 
-#: ../src/applet.c:1836 ../src/applet.c:2635
+#: ../src/applet.c:1830 ../src/applet.c:2631
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2057
+#: ../src/applet.c:2051
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2066
+#: ../src/applet.c:2060
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2069
 msgid "Enable _Mobile Broadband"
 msgstr "Enable _Mobile Broadband"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2078
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Enable WiMA_X Mobile Broadband"
 
 #. Toggle notifications item
-#: ../src/applet.c:2095
+#: ../src/applet.c:2089
 msgid "Enable N_otifications"
 msgstr "Enable N_otifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2106
+#: ../src/applet.c:2100
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2116
+#: ../src/applet.c:2110
 msgid "Edit Connections..."
 msgstr "Edit Connectionsâ"
 
 #. Help item
-#: ../src/applet.c:2130
+#: ../src/applet.c:2124
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../src/applet.c:2139
+#: ../src/applet.c:2133
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2316
+#: ../src/applet.c:2310
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../src/applet.c:2317
+#: ../src/applet.c:2311
 msgid "The network connection has been disconnected."
 msgstr "The network connection has been disconnected."
 
-#: ../src/applet.c:2498
+#: ../src/applet.c:2494
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparing network connection '%s'â"
 
-#: ../src/applet.c:2501
+#: ../src/applet.c:2497
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "User authentication required for network connection '%s'â"
 
-#: ../src/applet.c:2507
+#: ../src/applet.c:2503
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Network connection '%s' active"
 
-#: ../src/applet.c:2590
+#: ../src/applet.c:2586
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starting VPN connection '%s'â"
 
-#: ../src/applet.c:2593
+#: ../src/applet.c:2589
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "User authentication required for VPN connection '%s'â"
 
 #
-#: ../src/applet.c:2596
+#: ../src/applet.c:2592
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Requesting a VPN address for '%s'â"
 
-#: ../src/applet.c:2599
+#: ../src/applet.c:2595
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN connection '%s' active"
 
-#: ../src/applet.c:2640
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:3354
+#: ../src/applet.c:3336
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
@@ -1211,11 +1242,15 @@ msgstr "D_HCP client ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:307
 msgid "S_earch domains:"
 msgstr "S_earch domains:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:298
 msgid "_DNS servers:"
 msgstr "_DNS servers:"
 
@@ -1591,20 +1626,20 @@ msgstr "Createâ"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:745
 #: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+#: ../src/connection-editor/page-ip4.c:911
+#: ../src/connection-editor/page-ip6.c:877
 msgid "Address"
 msgstr "Address"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/page-ip4.c:928
 msgid "Netmask"
 msgstr "Netmask"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:779
 #: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/page-ip6.c:911
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -1614,7 +1649,7 @@ msgid "Metric"
 msgstr "Metric"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/page-ip6.c:894
 msgid "Prefix"
 msgstr "Prefix"
 
@@ -1628,7 +1663,7 @@ msgstr "DSL"
 msgid "Could not load DSL user interface."
 msgstr "Could not load DSL user interface."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:232
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL connection %d"
@@ -1680,16 +1715,26 @@ msgstr "Link-Local Only"
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:296
+msgid "Additional _DNS servers:"
+msgstr "Additional _DNS servers:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:305
+msgid "Additional s_earch domains:"
+msgstr "Additional s_earch domains:"
+
+#: ../src/connection-editor/page-ip4.c:843
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editing IPv4 routes for %s"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:992
 msgid "IPv4 Settings"
 msgstr "IPv4 Settings"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:994
 msgid "Could not load IPv4 user interface."
 msgstr "Could not load IPv4 user interface."
 
@@ -1698,7 +1743,7 @@ msgid "Automatic, addresses only"
 msgstr "Automatic, addresses only"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "Ignore"
 
@@ -1706,16 +1751,16 @@ msgstr "Ignore"
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:809
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editing IPv6 routes for %s"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:956
 msgid "IPv6 Settings"
 msgstr "IPv6 Settings"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:958
 msgid "Could not load IPv6 user interface."
 msgstr "Could not load IPv6 user interface."
 
@@ -1813,8 +1858,8 @@ msgstr "Could not find VPN plugin service for '%s'."
 msgid "VPN connection %d"
 msgstr "VPN connection %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-wired.c:91
+#: ../src/connection-editor/page-wireless.c:95
 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"
@@ -1822,17 +1867,17 @@ 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:272
+#: ../src/connection-editor/page-wired.c:271
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 #: ../src/connection-editor/nm-connection-list.c:1502
 msgid "Wired"
 msgstr "Wired"
 
-#: ../src/connection-editor/page-wired.c:274
+#: ../src/connection-editor/page-wired.c:273
 msgid "Could not load wired user interface."
 msgstr "Could not load wired user interface."
 
-#: ../src/connection-editor/page-wired.c:449
+#: ../src/connection-editor/page-wired.c:448
 #, c-format
 msgid "Wired connection %d"
 msgstr "Wired connection %d"
@@ -1850,29 +1895,29 @@ msgstr "Could not load Wired Security security user interface."
 msgid "Use 802.1_X security for this connection"
 msgstr "Use 802.1_X security for this connection"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
+#: ../src/connection-editor/page-wireless.c:172
+#: ../src/connection-editor/page-wireless.c:176
+#: ../src/connection-editor/page-wireless.c:197
 #, c-format
 msgid "default"
 msgstr "default"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wireless.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
+#: ../src/connection-editor/page-wireless.c:455
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 #: ../src/connection-editor/nm-connection-list.c:1506
 msgid "Wireless"
 msgstr "Wireless"
 
-#: ../src/connection-editor/page-wireless.c:459
+#: ../src/connection-editor/page-wireless.c:457
 msgid "Could not load WiFi user interface."
 msgstr "Could not load WiFi user interface."
 
-#: ../src/connection-editor/page-wireless.c:663
+#: ../src/connection-editor/page-wireless.c:661
 #, c-format
 msgid "Wireless connection %d"
 msgstr "Wireless connection %d"
@@ -1915,16 +1960,16 @@ msgstr "Wireless Security"
 msgid "Could not load WiFi security user interface."
 msgstr "Could not load WiFi security user interface."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/nm-connection-editor.c:102
 #, c-format
 msgid "Editing %s"
 msgstr "Editing %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:105
+#: ../src/connection-editor/nm-connection-editor.c:106
 msgid "Editing un-named connection"
 msgstr "Editing un-named connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:291
+#: ../src/connection-editor/nm-connection-editor.c:292
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1932,23 +1977,23 @@ msgstr ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 
-#: ../src/connection-editor/nm-connection-editor.c:394
+#: ../src/connection-editor/nm-connection-editor.c:395
 msgid "Error creating connection editor dialog."
 msgstr "Error creating connection editor dialogue."
 
-#: ../src/connection-editor/nm-connection-editor.c:406
+#: ../src/connection-editor/nm-connection-editor.c:407
 msgid "_Save"
 msgstr "_Save"
 
-#: ../src/connection-editor/nm-connection-editor.c:407
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "Save any changes made to this connection."
 msgstr "Save any changes made to this connection."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:409
 msgid "_Save..."
 msgstr "_Saveâ"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Authenticate to save this connection for all users of this machine."
 
@@ -2208,61 +2253,74 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "Export VPN connectionâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
+#: ../src/gnome-bluetooth/bt-widget.c:321
 #, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Failed to create PAN connection: %s"
-
-#: ../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!"
+msgid ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s Network"
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %"
+"s)."
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+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:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "Access the Internet using your mobile phone (DUN)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Failed to create DUN connection: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "Your phone is now ready to use!"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "Mobile wizard was cancelled"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Unknown phone device type (not GSM or CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:567
+msgid "unknown modem type."
+msgstr "unknown modem type."
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "failed to connect to the phone."
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "unexpectedly disconnected from the phone."
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "timed out detecting phone details."
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "Detecting phone configurationâ"
 
-#: ../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:980
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2270,52 +2328,38 @@ msgstr ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1012
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, 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:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+msgid "Failed to create PAN connection: %s"
+msgstr "Failed to create PAN connection: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, 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:1098
-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:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Access the Internet using your mobile phone (DUN)"
+msgid "%s Network"
+msgstr "%s Network"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:205
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Your mobile broadband connection is configured with the following settings:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:212
 msgid "Your Device:"
 msgstr "Your Device:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:223
 msgid "Your Provider:"
 msgstr "Your Provider:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:234
 msgid "Your Plan:"
 msgstr "Your Plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../src/libnm-gtk/nm-mobile-wizard.c:259
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
@@ -2329,23 +2373,23 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnm-gtk/nm-mobile-wizard.c:271
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirm Mobile Broadband Settings"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:332
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:487
 msgid "_Select your plan:"
 msgstr "_Select your plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../src/libnm-gtk/nm-mobile-wizard.c:511
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Selected plan _APN (Access Point Name):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:528
+#: ../src/libnm-gtk/nm-mobile-wizard.c:535
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2357,67 +2401,67 @@ msgstr ""
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:542
 msgid "Choose your Billing Plan"
 msgstr "Choose your Billing Plan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:590
 msgid "My plan is not listed..."
 msgstr "My plan is not listedâ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnm-gtk/nm-mobile-wizard.c:747
 msgid "Select your provider from a _list:"
 msgstr "Select your provider from a _list:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:760
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:785
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "I can't find my provider and I wish to enter it _manually:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnm-gtk/nm-mobile-wizard.c:796
 msgid "Provider:"
 msgstr "Provider:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../src/libnm-gtk/nm-mobile-wizard.c:820
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:819
+#: ../src/libnm-gtk/nm-mobile-wizard.c:826
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnm-gtk/nm-mobile-wizard.c:837
 msgid "Choose your Provider"
 msgstr "Choose your Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
 msgid "Country or Region List:"
 msgstr "Country or Region List:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or region"
 msgstr "Country or region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
 msgid "My country is not listed"
 msgstr "My country is not listed"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
 msgid "Choose your Provider's Country or Region"
 msgstr "Choose your Provider's Country or Region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2425,35 +2469,35 @@ msgstr ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "mobile (3G) network."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
 msgid "You will need the following information:"
 msgstr "You will need the following information:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid "Your broadband provider's name"
 msgstr "Your broadband provider's name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
 msgid "Your broadband billing plan name"
 msgstr "Your broadband billing plan name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(in some cases) Your broadband billing plan APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Create a connection for _this mobile broadband device:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1456
 msgid "Any device"
 msgstr "Any device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set up a Mobile Broadband Connection"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
 msgid "New Mobile Broadband Connection"
 msgstr "New Mobile Broadband Connection"
 
@@ -2630,6 +2674,12 @@ msgstr "Roaming network"
 msgid "Default"
 msgstr "Default"
 
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:325
+#, c-format
+msgid "%s connection"
+msgstr "%s connection"
+
 #: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -2638,11 +2688,11 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 
-#: ../src/wireless-security/eap-method.c:279
+#: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "No Certificate Authority certificate chosen"
 
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/wireless-security/eap-method.c:276
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2652,15 +2702,15 @@ msgstr ""
 "to insecure, rogue wireless networks.  Would you like to choose a "
 "Certificate Authority certificate?"
 
-#: ../src/wireless-security/eap-method.c:289
+#: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
 msgstr "Choose CA Certificate"
 
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:645
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:651
+#: ../src/wireless-security/eap-method.c:648
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
@@ -2858,6 +2908,13 @@ msgstr "Sho_w key"
 msgid "WEP inde_x:"
 msgstr "WEP inde_x:"
 
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "could not find the Bluetooth device."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+
 #
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "Click on this icon to connect to a wireless network"
@@ -2908,9 +2965,6 @@ msgstr "WEP inde_x:"
 #~ msgid "Running PPP on device %s..."
 #~ msgstr "Running PPP on device %s..."
 
-#~ msgid "CDMA connection"
-#~ msgstr "CDMA connection"
-
 #~ msgid "Auto GSM network connection"
 #~ msgstr "Auto GSM network connection"
 



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