[network-manager-applet] Updated British English translation



commit c27628ff7fd7bf2582371bad6cbf4d52910fd1d5
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue Mar 26 18:11:34 2013 +0000

    Updated British English translation

 po/en_GB.po | 3216 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1819 insertions(+), 1397 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 00e08bb..8a49f4e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager package.
 # David Lodge <dave cirt net>, 2004.
-# Bruce Cowan <bruce bcowan me uk>, 2011, 2012.
+# Bruce Cowan <bruce bcowan me uk>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 14:49+0100\n"
-"PO-Revision-Date: 2012-09-05 14:50+0100\n"
+"POT-Creation-Date: 2013-03-26 18:07+0000\n"
+"PO-Revision-Date: 2013-03-26 18:11+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -42,7 +42,8 @@ msgstr "Disable connected notifications"
 
 #: ../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."
+msgstr ""
+"Set this to true to disable notifications when connecting to a network."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -72,11 +73,9 @@ msgstr "Suppress networks available notifications"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -117,421 +116,670 @@ 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: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: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/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+msgid "802.1X authentication"
+msgstr "802.1X authentication"
 
-#: ../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"
+#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Network name:"
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "You are now connected to the mobile broadband network."
+#: ../src/applet.c:541
+msgid "Failed to add/activate connection"
+msgstr "Failed to add/activate connection"
 
-#: ../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.c:543 ../src/applet.c:587 ../src/applet.c:613
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+msgid "Unknown error"
+msgstr "Unknown error"
 
-#: ../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.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
+msgid "Connection failure"
+msgstr "Connection failure"
 
-#: ../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.c:585
+msgid "Device disconnect failed"
+msgstr "Device disconnect failed"
 
-#
-#: ../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.c:590
+msgid "Disconnect failure"
+msgstr "Disconnect failure"
 
-#: ../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.c:611
+msgid "Connection activation failed"
+msgstr "Connection activation failed"
 
-#: ../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.c:982 ../src/applet-device-wifi.c:1069
+msgid "Don't show this message again"
+msgstr "Don't show this message again"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:1071
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobile Broadband (%s)"
-
-#: ../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
-msgid "Mobile Broadband"
-msgstr "Mobile Broadband"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:409
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "New Mobile Broadband (CDMA) connection…"
-
-#: ../src/applet-device-cdma.c:443
-msgid "You are now connected to the CDMA network."
-msgstr "You are now connected to the CDMA network."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:1074
 #, 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:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
-msgid "CDMA network."
-msgstr "CDMA network."
-
-#: ../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: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: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:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "New Mobile Broadband (GSM) connection…"
-
-#: ../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:652
-msgid "PIN code required"
-msgstr "PIN code required"
-
-#: ../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"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 
-#: ../src/applet-device-gsm.c:781
+#: ../src/applet.c:1077
 #, 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:873
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Wrong PIN code; please contact your provider."
-
-#: ../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:923
-msgid "Sending unlock code..."
-msgstr "Sending unlock code…"
-
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN unlock required"
-
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN Unlock Required"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet.c:1080
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "PIN code:"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "Show PIN code"
-
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK unlock required"
-
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK Unlock Required"
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet.c:1083
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "PUK code:"
-
-#. Translators: New PIN entry label
-#: ../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: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:1013
-msgid "Show PIN/PUK codes"
-msgstr "Show PIN/PUK codes"
-
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
-msgid "GSM network."
-msgstr "GSM network."
-
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "Auto Ethernet"
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
 
-#: ../src/applet-device-wired.c:205
+#: ../src/applet.c:1086
 #, c-format
-msgid "Wired Networks (%s)"
-msgstr "Wired Networks (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 
-#: ../src/applet-device-wired.c:207
+#: ../src/applet.c:1089
 #, c-format
-msgid "Wired Network (%s)"
-msgstr "Wired Network (%s)"
-
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "Wired Networks"
-
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "Wired Network"
-
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "disconnected"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "You are now connected to the wired network."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
 
-#: ../src/applet-device-wired.c:300
+#: ../src/applet.c:1092
 #, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "Preparing wired network connection '%s'…"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
 
-#: ../src/applet-device-wired.c:303
+#: ../src/applet.c:1099
 #, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "Configuring wired network connection '%s'…"
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed."
 
-#: ../src/applet-device-wired.c:306
+#: ../src/applet.c:1117
 #, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "User authentication required for wired network connection '%s'…"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 
-#
-#: ../src/applet-device-wired.c:309
+#: ../src/applet.c:1120
 #, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "Requesting a wired network address for '%s'…"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
 
-#: ../src/applet-device-wired.c:313
+#: ../src/applet.c:1126
 #, c-format
-msgid "Wired network connection '%s' active"
-msgstr "Wired network connection '%s' active"
-
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL authentication"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"The VPN connection '%s' disconnected."
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "_Connect to Hidden Wireless Network…"
+#: ../src/applet.c:1156
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "Create _New Wireless Network…"
+#: ../src/applet.c:1158
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN connection has been successfully established.\n"
 
-#: ../src/applet-device-wifi.c:292
-msgid "(none)"
-msgstr "(none)"
+#: ../src/applet.c:1160
+msgid "VPN Login Message"
+msgstr "VPN Login Message"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Wireless Networks (%s)"
+#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+msgid "VPN Connection Failed"
+msgstr "VPN Connection Failed"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet.c:1231
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "Wireless Network (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1234
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1549
+msgid "device not ready (firmware missing)"
+msgstr "device not ready (firmware missing)"
+
+#: ../src/applet.c:1551
+msgid "device not ready"
+msgstr "device not ready"
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+msgid "disconnected"
+msgstr "disconnected"
+
+#: ../src/applet.c:1577
+msgid "Disconnect"
+msgstr "Disconnect"
+
+#: ../src/applet.c:1591
+msgid "device not managed"
+msgstr "device not managed"
+
+#: ../src/applet.c:1635
+msgid "No network devices available"
+msgstr "No network devices available"
+
+#: ../src/applet.c:1723
+msgid "_VPN Connections"
+msgstr "_VPN Connections"
+
+#: ../src/applet.c:1780
+msgid "_Configure VPN..."
+msgstr "_Configure VPN…"
+
+#: ../src/applet.c:1784
+msgid "_Disconnect VPN"
+msgstr "_Disconnect VPN"
+
+#: ../src/applet.c:1878
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager is not running…"
+
+#: ../src/applet.c:1883 ../src/applet.c:2735
+msgid "Networking disabled"
+msgstr "Networking disabled"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:2104
+msgid "Enable _Networking"
+msgstr "Enable _Networking"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2113
+msgid "Enable _Wi-Fi"
+msgstr "Enable _Wi-Fi"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2122
+msgid "Enable _Mobile Broadband"
+msgstr "Enable _Mobile Broadband"
+
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2131
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "Enable WiMA_X Mobile Broadband"
+
+#. Toggle notifications item
+#: ../src/applet.c:2142
+msgid "Enable N_otifications"
+msgstr "Enable N_otifications"
+
+#. 'Connection Information' item
+#: ../src/applet.c:2153
+msgid "Connection _Information"
+msgstr "Connection _Information"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:2163
+msgid "Edit Connections..."
+msgstr "Edit Connections…"
+
+#. Help item
+#: ../src/applet.c:2177
+msgid "_Help"
+msgstr "_Help"
+
+#. About item
+#: ../src/applet.c:2186
+msgid "_About"
+msgstr "_About"
+
+#: ../src/applet.c:2364
+msgid "Disconnected"
+msgstr "Disconnected"
+
+#: ../src/applet.c:2365
+msgid "The network connection has been disconnected."
+msgstr "The network connection has been disconnected."
+
+#: ../src/applet.c:2598
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Preparing network connection '%s'…"
+
+#: ../src/applet.c:2601
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "User authentication required for network connection '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Wireless Network"
-msgstr[1] "Wireless Networks"
+#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Requesting a network address for '%s'…"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "wireless is disabled"
+#: ../src/applet.c:2607
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Network connection '%s' active"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "wireless is disabled by hardware switch"
+#: ../src/applet.c:2690
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Starting VPN connection '%s'…"
 
-#: ../src/applet-device-wifi.c:889
-msgid "More networks"
-msgstr "More networks"
+#: ../src/applet.c:2693
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "User authentication required for VPN connection '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
-msgstr "Wireless Networks Available"
+#: ../src/applet.c:2696
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Requesting a VPN address for '%s'…"
+
+#: ../src/applet.c:2699
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN connection '%s' active"
 
-#: ../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.c:2740
+msgid "No network connection"
+msgstr "No network connection"
 
-#: ../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.c:3441
+msgid "NetworkManager Applet"
+msgstr "NetworkManager Applet"
+
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
+#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
+msgid "Available"
+msgstr "Available"
 
 #
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
+#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "You are now connected to the wireless network '%s'."
+msgid "You are now connected to '%s'."
+msgstr "You are now connected to '%s'."
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
+#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
+msgid "Connection Established"
+msgstr "Connection Established"
+
+#: ../src/applet-device-bt.c:200
+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:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:585
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Preparing wireless network connection '%s'…"
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Preparing mobile broadband connection '%s'…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:588
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Configuring mobile broadband connection '%s'…"
+
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:591
+#, 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:239 ../src/mobile-helpers.c:611
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Mobile broadband connection '%s' active"
+
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
+#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobile Broadband (%s)"
+
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
+#: ../src/applet-device-gsm.c:307
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
+msgid "Mobile Broadband"
+msgstr "Mobile Broadband"
+
+#. Default connection item
+#: ../src/applet-device-cdma.c:316
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "New Mobile Broadband (CDMA) connection…"
+
+#: ../src/applet-device-cdma.c:350
+msgid "You are now connected to the CDMA network."
+msgstr "You are now connected to the CDMA network."
+
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+msgid "CDMA network."
+msgstr "CDMA network."
+
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
+#: ../src/applet-device-gsm.c:678
+msgid "You are now registered on the home network."
+msgstr "You are now registered on the home network."
+
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-gsm.c:684
+msgid "You are now registered on a roaming network."
+msgstr "You are now registered on a roaming network."
+
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "Auto Ethernet"
+
+#: ../src/applet-device-ethernet.c:202
+#, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Ethernet Networks (%s)"
+
+#: ../src/applet-device-ethernet.c:204
+#, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Ethernet Network (%s)"
+
+#: ../src/applet-device-ethernet.c:207
+msgid "Ethernet Networks"
+msgstr "Ethernet Networks"
+
+#: ../src/applet-device-ethernet.c:209
+msgid "Ethernet Network"
+msgstr "Ethernet Network"
+
+#: ../src/applet-device-ethernet.c:271
+msgid "You are now connected to the ethernet network."
+msgstr "You are now connected to the ethernet network."
+
+#: ../src/applet-device-ethernet.c:297
+#, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "Preparing ethernet network connection '%s'…"
+
+#: ../src/applet-device-ethernet.c:300
+#, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "Configuring ethernet network connection '%s'…"
+
+#: ../src/applet-device-ethernet.c:303
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Configuring wireless network connection '%s'…"
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "User authentication required for ethernet network connection '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-ethernet.c:306
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "Requesting an ethernet network address for '%s'…"
+
+#: ../src/applet-device-ethernet.c:310
+#, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr "Ethernet network connection '%s' active"
+
+#: ../src/applet-device-ethernet.c:491
+msgid "DSL authentication"
+msgstr "DSL authentication"
+
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Wrong PUK code; please contact your provider."
+
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Wrong PIN code; please contact your provider."
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
+msgid "Sending unlock code..."
+msgstr "Sending unlock code…"
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:785
+msgid "New Mobile Broadband connection..."
+msgstr "New Mobile Broadband connection…"
+
+#: ../src/applet-device-broadband.c:821
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "You are now connected to the Mobile Broadband network."
+
+#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
+msgid "Mobile Broadband network."
+msgstr "Mobile Broadband network."
+
+#. Default connection item
+#: ../src/applet-device-gsm.c:372
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "New Mobile Broadband (GSM) connection…"
+
+#: ../src/applet-device-gsm.c:406
+msgid "You are now connected to the GSM network."
+msgstr "You are now connected to the GSM network."
+
+#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
+msgid "GSM network."
+msgstr "GSM network."
+
+#: ../src/applet-device-wifi.c:98
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "_Connect to Hidden Wi-Fi Network…"
+
+#: ../src/applet-device-wifi.c:149
+msgid "Create _New Wi-Fi Network..."
+msgstr "Create _New Wi-Fi Network…"
+
+#: ../src/applet-device-wifi.c:293
+msgid "(none)"
+msgstr "(none)"
+
+#: ../src/applet-device-wifi.c:787
+#, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi Networks (%s)"
+
+#: ../src/applet-device-wifi.c:789
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "User authentication required for wireless network '%s'…"
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi Network (%s)"
+
+#: ../src/applet-device-wifi.c:791
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Wi-Fi Network"
+msgstr[1] "Wi-Fi Networks"
+
+#: ../src/applet-device-wifi.c:824
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi is disabled"
+
+#: ../src/applet-device-wifi.c:825
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "Wi-Fi is disabled by hardware switch"
+
+#: ../src/applet-device-wifi.c:886
+msgid "More networks"
+msgstr "More networks"
+
+#
+#: ../src/applet-device-wifi.c:1065
+msgid "Wi-Fi Networks Available"
+msgstr "Wi-Fi Networks Available"
+
+#: ../src/applet-device-wifi.c:1066
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "Use the network menu to connect to a Wi-Fi network"
 
 #
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1260
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Requesting a wireless network address for '%s'…"
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "You are now connected to the Wi-Fi network '%s'."
 
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1291
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Preparing Wi-Fi network connection '%s'…"
 
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1294
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Wireless network connection '%s' active"
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Configuring Wi-Fi network connection '%s'…"
 
-#: ../src/applet-device-wifi.c:1377
-msgid "Failed to activate connection"
-msgstr "Failed to activate connection"
+#
+#: ../src/applet-device-wifi.c:1297
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "User authentication required for Wi-Fi network '%s'…"
 
-#: ../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:1300
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Requesting a Wi-Fi network address for '%s'…"
 
-#: ../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:1321
+#, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "Wi-Fi network connection '%s' active: %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1326
+#, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wi-Fi network connection '%s' active"
 
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1374
+msgid "Failed to activate connection"
+msgstr "Failed to activate connection"
+
+#: ../src/applet-device-wifi.c:1393
 msgid "Failed to add new connection"
 msgstr "Failed to add new connection"
 
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX Mobile Broadband (%s)"
 
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX Mobile Broadband"
 
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
 msgid "WiMAX is disabled"
 msgstr "WiMAX is disabled"
 
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX is disabled by hardware switch"
 
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
 msgid "You are now connected to the WiMAX network."
 msgstr "You are now connected to the WiMAX network."
 
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobile broadband connection '%s' active: (%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+msgid "roaming"
+msgstr "roaming"
+
 #: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
+#: ../src/connection-editor/page-wifi-security.c:313
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -550,8 +798,7 @@ msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
@@ -613,6 +860,7 @@ msgstr "WiMAX (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:345
 msgid "General"
 msgstr "General"
 
@@ -720,7 +968,7 @@ msgstr "VPN Banner:"
 msgid "Base Connection:"
 msgstr "Base Connection:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -766,353 +1014,71 @@ msgstr "A password is required to connect to '%s'."
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet.c:488
-msgid "Failed to add/activate connection"
-msgstr "Failed to add/activate connection"
-
-#: ../src/applet.c:532
-msgid "Device disconnect failed"
-msgstr "Device disconnect failed"
-
-#: ../src/applet.c:537
-msgid "Disconnect failure"
-msgstr "Disconnect failure"
-
-#: ../src/applet.c:558
-msgid "Connection activation failed"
-msgstr "Connection activation failed"
-
-#: ../src/applet.c:1013
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-
-#: ../src/applet.c:1016
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
-
-#: ../src/applet.c:1022
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-
-#: ../src/applet.c:1025
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-
-#: ../src/applet.c:1028
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-
-#: ../src/applet.c:1031
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
-
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-
-#: ../src/applet.c:1041
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
-msgstr ""
-"\n"
-"The VPN connection '%s' failed."
-
-#: ../src/applet.c:1059
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-
-#: ../src/applet.c:1062
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-
-#: ../src/applet.c:1068
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
-msgstr ""
-"\n"
-"The VPN connection '%s' disconnected."
-
-#: ../src/applet.c:1098
-#, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
-msgstr ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
-
-#: ../src/applet.c:1100
-msgid "VPN connection has been successfully established.\n"
-msgstr "VPN connection has been successfully established.\n"
-
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "VPN Login Message"
-
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "VPN Connection Failed"
-
-#: ../src/applet.c:1173
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1176
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr "device not ready (firmware missing)"
-
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "device not ready"
-
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "Disconnect"
-
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "device not managed"
-
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "No network devices available"
-
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_VPN Connections"
-
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "_Configure VPN…"
-
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "_Disconnect VPN"
-
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager is not running…"
-
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "Networking disabled"
-
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "Enable _Networking"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "Enable _Wireless"
-
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "Enable _Mobile Broadband"
-
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Enable WiMA_X Mobile Broadband"
-
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "Enable N_otifications"
-
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "Connection _Information"
-
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "Edit Connections…"
-
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "_Help"
-
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "_About"
-
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "Disconnected"
-
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "The network connection has been disconnected."
-
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Preparing network connection '%s'…"
-
-#: ../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:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Network connection '%s' active"
-
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Starting VPN connection '%s'…"
-
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "User authentication required for VPN connection '%s'…"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN unlock required"
 
-#
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Requesting a VPN address for '%s'…"
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN Unlock Required"
 
-#: ../src/applet.c:2595
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN connection '%s' active"
-
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "No network connection"
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 
-#: ../src/applet.c:3336
-msgid "NetworkManager Applet"
-msgstr "NetworkManager Applet"
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN code:"
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Automatically unlock this device"
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "Show PIN code"
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Unlock"
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK unlock required"
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "Connection Information"
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK Unlock Required"
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "Active Network Connections"
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Wired 802.1X authentication"
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK code:"
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "_Network name:"
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "New PIN code:"
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "automatic"
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "Re-enter new PIN code:"
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Failed to update connection secrets due to an unknown error."
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "Show PIN/PUK codes"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
@@ -1144,8 +1110,183 @@ msgstr ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Choose a Connection Type"
+msgstr "Choose a Connection Type"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+msgstr ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:6
+msgid "Create…"
+msgstr "Create…"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "Round-robin"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "Active backup"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "Adaptive transmit load balancing"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "Adaptive load balancing"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (recommended)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "Bonded _connections:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+msgid "_Mode:"
+msgstr "_Mode:"
+
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "_Edit"
+msgstr "_Edit"
+
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr "Monitoring _frequency:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr "ms"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+msgid "_Interface name:"
+msgstr "_Interface name:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr "_Link Monitoring:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr "ARP _targets:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr "Link _up delay:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr "Link _down delay:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr "Path _cost:"
+
+#
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+msgid "_Priority:"
+msgstr "_Priority:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr "_Hairpin mode:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+msgid "Bridged _connections:"
+msgstr "Bridged _connections:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "_Forward delay:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr "_Hello time:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "s"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "Enable _STP (Spanning Tree Protocol)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "_Max age:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr "_Ageing time:"
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "automatic"
+
+#: ../src/connection-editor/ce-page.c:356
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "Failed to update connection secrets due to an unknown error."
+
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 #: ../src/wireless-security/eap-method-leap.ui.h:1
 #: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
@@ -1166,7 +1307,7 @@ msgid "Sho_w password"
 msgstr "Sho_w password"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1174,15 +1315,130 @@ msgstr "Sho_w password"
 msgid "_Password:"
 msgstr "_Password:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatic"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Twisted Pair (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Speed:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Full duple_x"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Aut_onegotiate"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#: ../src/connection-editor/ce-page-wimax.ui.h:1
+msgid "_Device MAC address:"
+msgstr "_Device MAC address:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "C_loned MAC address:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "_MTU:"
+msgstr "_MTU:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "bytes"
+msgstr "bytes"
+
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "Automatically connect to _VPN when using this connection"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+msgid "All _users may connect to this network"
+msgstr "All _users may connect to this network"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "_Automatically connect to this network when it is available"
+msgstr "_Automatically connect to this network when it is available"
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr "Firewall _zone:"
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr "_Transport mode:"
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr "Datagram"
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr "Connected"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1313,43 +1569,51 @@ msgid "Prefer 2G (GPRS/EDGE)"
 msgstr "Prefer 2G (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Prefer 4G (LTE)"
+msgstr "Prefer 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr "Use only 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "Nu_mber:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "N_etwork ID:"
 msgstr "N_etwork ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
 msgid "Change..."
 msgstr "Change…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
 msgid "Allow _roaming if home network is not available"
 msgstr "Allow _roaming if home network is not available"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
 msgid "Sho_w passwords"
 msgstr "Sho_w passwords"
 
@@ -1389,162 +1653,101 @@ msgstr "Allow _BSD data compression"
 msgid "Allow _Deflate data compression"
 msgstr "Allow _Deflate data compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use TCP _header compression"
-msgstr "Use TCP _header compression"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "Echo"
-msgstr "Echo"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "Send PPP _echo packets"
-msgstr "Send PPP _echo packets"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr "Use TCP _header compression"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Speed:"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr "Send PPP _echo packets"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "_Parent interface:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "Aut_onegotiate"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "VLAN interface _name:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "_Device MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "_Cloned MAC address:"
+msgstr "_Cloned MAC address:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "C_loned MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr "Device name + number"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number 
together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + number"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "S_ecurity:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"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:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
 msgstr "C_hannel:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "M_ode:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "S_ecurity:"
-
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
 msgstr "Allowed Authentication Methods"
@@ -1577,96 +1780,409 @@ msgstr "Challenge Handshake Authentication Protocol"
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
+msgid "Address"
+msgstr "Address"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
+msgid "Netmask"
+msgstr "Netmask"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
+msgid "Metric"
+msgstr "Metric"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
+msgid "Prefix"
+msgstr "Prefix"
+
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:483 ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
+msgid "Bond"
+msgstr "Bond"
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:212
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr "Bridge"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:252
+msgid "Hardware"
+msgstr "Hardware"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "Virtual"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
+msgid "Import a saved VPN configuration..."
+msgstr "Import a saved VPN configuration…"
+
+#: ../src/connection-editor/new-connection.c:371
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+"The connection editor dialogue could not be initialised due to an unknown "
+"error."
+
+#: ../src/connection-editor/new-connection.c:380
+msgid "Could not create new connection"
+msgstr "Could not create new connection"
+
+#: ../src/connection-editor/new-connection.c:515
+msgid "Connection delete failed"
+msgstr "Connection delete failed"
+
+#: ../src/connection-editor/new-connection.c:562
+#, 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-editor.c:118
+#, c-format
+msgid "Editing %s"
+msgstr "Editing %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:122
+msgid "Editing un-named connection"
+msgstr "Editing un-named connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:282
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+
+#: ../src/connection-editor/nm-connection-editor.c:408
+msgid "_Save"
+msgstr "_Save"
+
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "Save any changes made to this connection."
+msgstr "Save any changes made to this connection."
+
+#: ../src/connection-editor/nm-connection-editor.c:410
+msgid "_Save..."
+msgstr "_Save…"
+
+#: ../src/connection-editor/nm-connection-editor.c:411
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "Authenticate to save this connection for all users of this machine."
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not create connection"
+msgstr "Could not create connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not edit connection"
+msgstr "Could not edit connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+msgid "Unknown error creating connection editor dialog."
+msgstr "Unknown error creating connection editor dialogue."
+
+#: ../src/connection-editor/nm-connection-editor.c:536
+msgid "Error saving connection"
+msgstr "Error saving connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:537
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "The property '%s' / '%s' is invalid: %d"
+
+#: ../src/connection-editor/nm-connection-editor.c:631
+msgid "Error initializing editor"
+msgstr "Error initialising editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:952
+msgid "Connection add failed"
+msgstr "Connection add failed"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
+msgid "Connection _name:"
+msgstr "Connection _name:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
+msgid "_Export..."
+msgstr "_Export…"
+
+#: ../src/connection-editor/nm-connection-list.c:143
+msgid "never"
+msgstr "never"
+
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
+msgid "now"
+msgstr "now"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
+
+#: ../src/connection-editor/nm-connection-list.c:176
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
+
+#: ../src/connection-editor/nm-connection-list.c:188
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
+
+#: ../src/connection-editor/nm-connection-list.c:194
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
+
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d year ago"
+msgstr[1] "%d years ago"
+
+#: ../src/connection-editor/nm-connection-list.c:631
+msgid "Name"
+msgstr "Name"
+
+#: ../src/connection-editor/nm-connection-list.c:644
+msgid "Last Used"
+msgstr "Last Used"
+
+#: ../src/connection-editor/nm-connection-list.c:686
+msgid "Edit the selected connection"
+msgstr "Edit the selected connection"
+
+#: ../src/connection-editor/nm-connection-list.c:687
+msgid "_Edit..."
+msgstr "_Edit…"
+
+#: ../src/connection-editor/nm-connection-list.c:688
+msgid "Authenticate to edit the selected connection"
+msgstr "Authenticate to edit the selected connection"
+
+#: ../src/connection-editor/nm-connection-list.c:703
+msgid "Delete the selected connection"
+msgstr "Delete the selected connection"
+
+#: ../src/connection-editor/nm-connection-list.c:704
+msgid "_Delete..."
+msgstr "_Delete…"
+
+#: ../src/connection-editor/nm-connection-list.c:705
+msgid "Authenticate to delete the selected connection"
+msgstr "Authenticate to delete the selected connection"
+
+#: ../src/connection-editor/nm-connection-list.c:942
+msgid "Error creating connection"
+msgstr "Error creating connection"
+
+#: ../src/connection-editor/nm-connection-list.c:943
+#, 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:998
+msgid "Error editing connection"
+msgstr "Error editing connection"
+
+#: ../src/connection-editor/nm-connection-list.c:999
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "Did not find a connection with UUID '%s'"
+
+#
+#: ../src/connection-editor/page-8021x-security.c:121
+msgid "802.1x Security"
+msgstr "802.1x Security"
+
+#: ../src/connection-editor/page-8021x-security.c:123
+msgid "Could not load 802.1x Security user interface."
+msgstr "Could not load 802.1x Security user interface."
+
+#: ../src/connection-editor/page-8021x-security.c:141
+msgid "Use 802.1_X security for this connection"
+msgstr "Use 802.1_X security for this connection"
+
+#: ../src/connection-editor/page-bond.c:422
+msgid "Could not load bond user interface."
+msgstr "Could not load bond user interface."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
+msgid "Bond connection %d"
+msgstr "Bond connection %d"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/page-bridge.c:215
+msgid "Could not load bridge user interface."
+msgstr "Could not load bridge user interface."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
-msgstr ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+#: ../src/connection-editor/page-bridge.c:310
+#, c-format
+msgid "Bridge connection %d"
+msgstr "Bridge connection %d"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr "Bridge Port"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Choose a VPN Connection Type"
+#: ../src/connection-editor/page-bridge-port.c:117
+msgid "Could not load bridge port user interface."
+msgstr "Could not load bridge port user interface."
+
+#: ../src/connection-editor/page-dsl.c:143
+msgid "Could not load DSL user interface."
+msgstr "Could not load DSL user interface."
+
+#: ../src/connection-editor/page-dsl.c:235
+#, c-format
+msgid "DSL connection %d"
+msgstr "DSL connection %d"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+#: ../src/connection-editor/page-ethernet.c:90
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:113
+#: ../src/connection-editor/page-wimax.c:70
 msgid ""
-"Select the type of VPN you wish to use for the new connection.  If the type "
-"of VPN connection you wish to create does not appear in the list, you may "
-"not have the correct VPN plugin installed."
+"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 ""
-"Select the type of VPN you wish to use for the new connection.  If the type "
-"of VPN connection you wish to create does not appear in the list, you may "
-"not have the correct VPN plugin installed."
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "Create…"
+"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/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
-msgid "Address"
-msgstr "Address"
+#: ../src/connection-editor/page-ethernet.c:253
+msgid "Could not load ethernet user interface."
+msgstr "Could not load ethernet user interface."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
-msgid "Netmask"
-msgstr "Netmask"
+#: ../src/connection-editor/page-ethernet.c:396
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "Ethernet connection %d"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Gateway"
-msgstr "Gateway"
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:59
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "Default"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-msgid "Metric"
-msgstr "Metric"
+#: ../src/connection-editor/page-general.c:60
+msgid ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Prefix"
-msgstr "Prefix"
+#: ../src/connection-editor/page-general.c:61
+msgid "FirewallD is not running."
+msgstr "FirewallD is not running."
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-general.c:348
+msgid "Could not load General user interface."
+msgstr "Could not load General user interface."
 
-#: ../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-infiniband.c:171
+msgid "Could not load InfiniBand user interface."
+msgstr "Could not load InfiniBand user interface."
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-infiniband.c:263
 #, c-format
-msgid "DSL connection %d"
-msgstr "DSL connection %d"
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand connection %d"
 
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
@@ -1725,16 +2241,16 @@ msgstr "Additional DNS ser_vers:"
 msgid "Additional s_earch domains:"
 msgstr "Additional s_earch domains:"
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editing IPv4 routes for %s"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1011
 msgid "IPv4 Settings"
 msgstr "IPv4 Settings"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1013
 msgid "Could not load IPv4 user interface."
 msgstr "Could not load IPv4 user interface."
 
@@ -1751,33 +2267,38 @@ msgstr "Ignore"
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editing IPv6 routes for %s"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:975
 msgid "IPv6 Settings"
 msgstr "IPv6 Settings"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:977
 msgid "Could not load IPv6 user interface."
 msgstr "Could not load IPv6 user interface."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:284
+#, c-format
+msgid "%s slave %d"
+msgstr "%s slave %d"
+
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
 msgstr "Could not load mobile broadband user interface."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:408
 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:639
+#: ../src/connection-editor/page-mobile.c:658
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Select Mobile Broadband Provider Type"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:693
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1785,343 +2306,93 @@ msgstr ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:698
 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:686
+#: ../src/connection-editor/page-mobile.c:705
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
-msgid "PAP"
-msgstr "PAP"
-
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
-msgid "MSCHAP"
-msgstr "MSCHAP"
-
-#. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
-msgid "none"
-msgstr "none"
-
-#: ../src/connection-editor/page-ppp.c:201
-#, c-format
-msgid "Editing PPP authentication methods for %s"
-msgstr "Editing PPP authentication methods for %s"
-
-#: ../src/connection-editor/page-ppp.c:282
-msgid "PPP Settings"
-msgstr "PPP Settings"
-
-#: ../src/connection-editor/page-ppp.c:284
-msgid "Could not load PPP user interface."
-msgstr "Could not load PPP user interface."
-
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
-
-#: ../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: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:201
-#: ../src/connection-editor/nm-connection-list.c:899
-#, c-format
-msgid "VPN connection %d"
-msgstr "VPN connection %d"
-
-#: ../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"
-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: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:273
-msgid "Could not load wired user interface."
-msgstr "Could not load wired user interface."
-
-#: ../src/connection-editor/page-wired.c:448
-#, c-format
-msgid "Wired connection %d"
-msgstr "Wired connection %d"
-
-#
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "802.1x Security"
-
-#: ../src/connection-editor/page-wired-security.c:121
-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:139
-msgid "Use 802.1_X security for this connection"
-msgstr "Use 802.1_X security for this connection"
-
-#: ../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:201
-#, c-format
-msgid "%u (%u MHz)"
-msgstr "%u (%u MHz)"
-
-#: ../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:457
-msgid "Could not load WiFi user interface."
-msgstr "Could not load WiFi user interface."
-
-#: ../src/connection-editor/page-wireless.c:661
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Wireless connection %d"
-
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
-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:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit Passphrase"
-
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
-msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamic WEP (802.1x)"
-
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
-msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
-
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 Enterprise"
-
-#: ../src/connection-editor/page-wireless-security.c:395
-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:405
-msgid "Wireless Security"
-msgstr "Wireless Security"
-
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
-msgstr "Could not load WiFi security user interface."
-
-#: ../src/connection-editor/nm-connection-editor.c:102
-#, c-format
-msgid "Editing %s"
-msgstr "Editing %s"
-
-#: ../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:292
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
-msgstr ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
-
-#: ../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:407
-msgid "_Save"
-msgstr "_Save"
-
-#: ../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:409
-msgid "_Save..."
-msgstr "_Save…"
-
-#: ../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."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "_Import"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "E_xport"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "Connection _name:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "Connect _automatically"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "A_vailable to all users"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "never"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "now"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minute ago"
-msgstr[1] "%d minutes ago"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hour ago"
-msgstr[1] "%d hours ago"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:270
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d month ago"
-msgstr[1] "%d months ago"
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:268
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d year ago"
-msgstr[1] "%d years ago"
+#: ../src/connection-editor/page-ppp.c:137
+msgid "EAP"
+msgstr "EAP"
 
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Connection add failed"
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Error saving connection"
+#: ../src/connection-editor/page-ppp.c:139
+#: ../src/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "The property '%s' / '%s' is invalid: %d"
+#: ../src/connection-editor/page-ppp.c:140
+#: ../src/wireless-security/eap-method-fast.c:277
+#: ../src/wireless-security/eap-method-peap.c:246
+#: ../src/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/connection-editor/page-ppp.c:141
+#: ../src/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "An unknown error occurred."
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:144
+msgid "none"
+msgstr "none"
 
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "Error initialising editor"
+#: ../src/connection-editor/page-ppp.c:204
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr "Editing PPP authentication methods for %s"
 
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr ""
-"The connection editor dialogue could not be initialised due to an unknown "
-"error."
+#: ../src/connection-editor/page-ppp.c:287
+msgid "PPP Settings"
+msgstr "PPP Settings"
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Could not create new connection"
+#: ../src/connection-editor/page-ppp.c:289
+msgid "Could not load PPP user interface."
+msgstr "Could not load PPP user interface."
 
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Could not edit new connection"
+#: ../src/connection-editor/page-vlan.c:482
+msgid "Could not load vlan user interface."
+msgstr "Could not load vlan user interface."
 
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "Could not edit connection"
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN connection %d"
 
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "Connection delete failed"
+#: ../src/connection-editor/page-vpn.c:115
+msgid "Could not load VPN user interface."
+msgstr "Could not load VPN user interface."
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-vpn.c:130
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Are you sure you wish to delete the connection %s?"
+msgid "Could not find VPN plugin service for '%s'."
+msgstr "Could not find VPN plugin service for '%s'."
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
-msgid "Cannot import VPN connection"
-msgstr "Cannot import VPN connection"
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN connection %d"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/page-vpn.c:250
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2131,79 +2402,106 @@ msgstr ""
 "\n"
 "Error: no VPN service type."
 
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "Could not edit imported connection"
+#: ../src/connection-editor/page-vpn.c:275
+msgid "Choose a VPN Connection Type"
+msgstr "Choose a VPN Connection Type"
 
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "Name"
+#: ../src/connection-editor/page-vpn.c:276
+msgid ""
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr ""
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
 
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "Last Used"
+#: ../src/connection-editor/page-wifi.c:98
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/nm-connection-list.c:1263
-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/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
+#, c-format
+msgid "default"
+msgstr "default"
 
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/connection-editor/page-wifi.c:219
+#, c-format
+msgid "%u (%u MHz)"
+msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "Edit the selected connection"
+#: ../src/connection-editor/page-wifi.c:485
+msgid "Could not load Wi-Fi user interface."
+msgstr "Could not load Wi-Fi user interface."
 
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "_Edit…"
+#: ../src/connection-editor/page-wifi.c:663
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Wi-Fi connection %d"
 
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "Authenticate to edit the selected connection"
+#: ../src/connection-editor/page-wifi-security.c:265
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "None"
 
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "_Delete"
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "Delete the selected connection"
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit Passphrase"
 
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "_Delete…"
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "Authenticate to delete the selected connection"
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "Error creating connection"
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Don't know how to create '%s' connections"
+#: ../src/connection-editor/page-wifi-security.c:396
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "Error editing connection"
+#
+#: ../src/connection-editor/page-wifi-security.c:407
+msgid "Wi-Fi Security"
+msgstr "Wi-Fi Security"
 
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Don't know how to edit '%s' connections"
+#: ../src/connection-editor/page-wifi-security.c:409
+msgid "Could not load Wi-Fi security user interface."
+msgstr "Could not load Wi-Fi security user interface."
 
-#: ../src/connection-editor/nm-connection-list.c:1643
+#: ../src/connection-editor/page-wimax.c:137
+msgid "Could not load WiMAX user interface."
+msgstr "Could not load WiMAX user interface."
+
+#: ../src/connection-editor/page-wimax.c:233
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Did not find a connection with UUID '%s'"
+msgid "WiMAX connection %d"
+msgstr "WiMAX connection %d"
+
+#: ../src/connection-editor/vpn-helpers.c:207
+msgid "Cannot import VPN connection"
+msgstr "Cannot import VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:209
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2216,29 +2514,29 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:263
+#: ../src/connection-editor/vpn-helpers.c:241
 msgid "Select file to import"
 msgstr "Select file to import"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:292
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "A file named \"%s\" already exists."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:294
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:296
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Do you want to replace %s with the VPN connection you are saving?"
 
-#: ../src/connection-editor/vpn-helpers.c:354
+#: ../src/connection-editor/vpn-helpers.c:332
 msgid "Cannot export VPN connection"
 msgstr "Cannot export VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:334
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2249,10 +2547,18 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:369
 msgid "Export VPN connection..."
 msgstr "Export VPN connection…"
 
+#: ../src/ethernet-dialog.c:91 ../src/ethernet-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/gnome-bluetooth/bt-widget.c:321
 #, c-format
 msgid ""
@@ -2265,8 +2571,7 @@ msgstr ""
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
 msgstr ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %"
-"s)."
+"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)"
@@ -2276,51 +2581,55 @@ msgstr "Use your mobile phone as a network device (PAN/NAP)"
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Access the Internet using your mobile phone (DUN)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Failed to create DUN connection: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:985
 msgid "Your phone is now ready to use!"
 msgstr "Your phone is now ready to use!"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
 msgid "Mobile wizard was canceled"
 msgstr "Mobile wizard was cancelled"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Unknown phone device type (not GSM or CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
 msgid "unknown modem type."
 msgstr "unknown modem type."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
 msgid "failed to connect to the phone."
 msgstr "failed to connect to the phone."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
 msgid "unexpectedly disconnected from the phone."
 msgstr "unexpectedly disconnected from the phone."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
 msgid "timed out detecting phone details."
 msgstr "timed out detecting phone details."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:816
 msgid "Detecting phone configuration..."
 msgstr "Detecting phone configuration…"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:869
+msgid "ModemManager is not running"
+msgstr "ModemManager is not running"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:946
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2328,38 +2637,54 @@ msgstr ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:983
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "Failed to create PAN connection: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:1004
 #, c-format
 msgid "%s Network"
 msgstr "%s Network"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "Automatically unlock this device"
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Unlock"
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Connection Information"
+
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "Active Network Connections"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
 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:212
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
 msgid "Your Device:"
 msgstr "Your Device:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
 msgid "Your Provider:"
 msgstr "Your Provider:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
 msgid "Your Plan:"
 msgstr "Your Plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 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 "
@@ -2373,23 +2698,23 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirm Mobile Broadband Settings"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
 msgid "_Select your plan:"
 msgstr "_Select your plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Selected plan _APN (Access Point Name):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2401,67 +2726,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:542
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
 msgid "Choose your Billing Plan"
 msgstr "Choose your Billing Plan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
 msgid "My plan is not listed..."
 msgstr "My plan is not listed…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 msgid "Select your provider from a _list:"
 msgstr "Select your provider from a _list:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 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:796
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
 msgid "Provider:"
 msgstr "Provider:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
 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:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:837
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
 msgid "Choose your Provider"
 msgstr "Choose your Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or Region List:"
 msgstr "Country or Region List:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "Country or region"
 msgstr "Country or region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
 msgid "My country is not listed"
 msgstr "My country is not listed"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
 msgid "Choose your Provider's Country or Region"
 msgstr "Choose your Provider's Country or Region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2469,99 +2794,133 @@ msgstr ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "mobile (3G) network."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
 msgid "You will need the following information:"
 msgstr "You will need the following information:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
 msgid "Your broadband provider's name"
 msgstr "Your broadband provider's name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Your broadband billing plan name"
 msgstr "Your broadband billing plan name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
 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:1441
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
 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:1456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
 msgid "Any device"
 msgstr "Any device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set up a Mobile Broadband Connection"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
 msgid "New Mobile Broadband Connection"
 msgstr "New Mobile Broadband Connection"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "Wired"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
 msgid "New..."
 msgstr "New…"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
 msgid "C_reate"
 msgstr "C_reate"
 
 #
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
-msgstr "Wireless Network Authentication Required"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi Network Authentication Required"
 
 #
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Authentication required by Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
-msgstr "Create New Wireless Network…"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Create New Wi-Fi Network"
 
 #
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
-msgstr "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "New Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-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/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Enter a name for the Wi-Fi network you wish to create."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
-msgstr "Connect to Hidden Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connect to Hidden Wi-Fi Network"
 
 #
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
-msgstr "Hidden wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Hidden Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 
 #
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
-msgstr "_Wireless security:"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _security:"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
@@ -2569,8 +2928,8 @@ msgstr "Co_nnection:"
 
 #
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
-msgstr "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _adapter:"
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2592,102 +2951,107 @@ msgstr ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:72
+msgid "HSPA+"
+msgstr "HSPA+"
+
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "LTE"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:112
 msgid "not enabled"
 msgstr "not enabled"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
 msgid "not registered"
 msgstr "not registered"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
 #, c-format
 msgid "Home network (%s)"
 msgstr "Home network (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
 #, c-format
 msgid "Home network"
 msgstr "Home network"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
 msgid "searching"
 msgstr "searching"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
 msgid "registration denied"
 msgstr "registration denied"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming network (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming network"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Default"
+#: ../src/mobile-helpers.c:317
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "PIN code for SIM card '%s' on '%s'"
+
+#: ../src/mobile-helpers.c:450
+msgid "PIN code required"
+msgstr "PIN code required"
+
+#: ../src/mobile-helpers.c:458
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "PIN code is needed for the mobile broadband device"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:174
 #, 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 "
-"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:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "No Certificate Authority certificate chosen"
@@ -2695,12 +3059,12 @@ msgstr "No Certificate Authority certificate chosen"
 #: ../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 "
-"Certificate Authority certificate?"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
 msgstr ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
@@ -2714,6 +3078,23 @@ msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:261
+#: ../src/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "Choose a PAC file…"
+
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC files (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr "All files"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Anonymous"
@@ -2746,30 +3127,13 @@ msgstr "_Inner authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
-
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Choose a PAC file…"
-
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC files (*.pac)"
-
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-msgstr "All files"
-
 #: ../src/wireless-security/eap-method-peap.c:263
 #: ../src/wireless-security/wireless-security.c:382
 msgid "MD5"
 msgstr "MD5"
 
 #: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
 #: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Choose a Certificate Authority certificate…"
@@ -2796,11 +3160,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:246
+#: ../src/wireless-security/eap-method-tls.c:260
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
 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 "
@@ -2814,11 +3178,11 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
 msgid "Choose your personal certificate..."
 msgstr "Choose your personal certificate…"
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
 msgid "Choose your private key..."
 msgstr "Choose your private key…"
 
@@ -2908,6 +3272,70 @@ msgstr "Sho_w key"
 msgid "WEP inde_x:"
 msgstr "WEP inde_x:"
 
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Wireless Networks (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Wireless Network (%s)"
+
+#
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "Wireless Network"
+#~ msgstr[1] "Wireless Networks"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "wireless is disabled"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "wireless is disabled by hardware switch"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Preparing wireless network connection '%s'…"
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Configuring wireless network connection '%s'…"
+
+#
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Requesting a wireless network address for '%s'…"
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Wireless network connection '%s' active"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "Could not load Wired Security security user interface."
+
+#~ msgid "Wireless"
+#~ msgstr "Wireless"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Wireless connection %d"
+
+#~ msgid "_Import"
+#~ msgstr "_Import"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "Connect _automatically"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "A_vailable to all users"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "An unknown error occurred."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "Could not edit new connection"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Could not edit imported connection"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "No VPN plugin available. Please install one to enable this button."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Don't know how to edit '%s' connections"
+
 #~ msgid "could not find the Bluetooth device."
 #~ msgstr "could not find the Bluetooth device."
 
@@ -2941,9 +3369,6 @@ msgstr "WEP inde_x:"
 #~ msgid "Network Manager"
 #~ msgstr "Network Manager"
 
-#~ msgid "C_onnect"
-#~ msgstr "C_onnect"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Other Wireless Networks…"
 
@@ -3337,9 +3762,6 @@ msgstr "WEP inde_x:"
 #~ msgid "Finishing connection to the wired network..."
 #~ msgstr "Finishing connection to the wired network..."
 
-#~ msgid "NetworkManager is not running"
-#~ msgstr "NetworkManager is not running"
-
 #
 #~ msgid "Connected to an Ad-Hoc wireless network"
 #~ msgstr "Connected to an Ad-Hoc wireless network"


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