summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorDavid Lodge <dave@cirt.net>2006-09-12 06:21:00 +0000
committerDavid Lodge <dave@cirt.net>2006-09-12 06:21:00 +0000
commit61343890a0b6c680079803dc7975662e16b89694 (patch)
treeea0eb5f2b6f3243922413f5b4f8d32b7ce88a72e /po/en_GB.po
parenta199361f5e51b8e2ad9e6e11b0c1d829e7b73d5c (diff)
downloadNetworkManager-61343890a0b6c680079803dc7975662e16b89694.tar.gz
2006-09-12 David Lodge <dave@cirt.net>
* en_GB.po: British (English) translation updated. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2026 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po964
1 files changed, 525 insertions, 439 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index a88b5737cf..76628562e3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,11 +5,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager \n"
+"Project-Id-Version: NetworkManager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-08 15:07+0100\n"
-"PO-Revision-Date: 2005-10-15 11:09+0100\n"
-"Last-Translator: James Ogley <james@usr-local-bin.org>\n"
+"POT-Creation-Date: 2006-09-12 07:19+0100\n"
+"PO-Revision-Date: 2006-09-12 07:20-0000\n"
+"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: English (British) <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,329 +17,387 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:867
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
#, c-format
msgid "Passphrase for wireless network %s"
msgstr "Passphrase for wireless network %s"
-#: ../gnome/applet/applet-dbus-info.c:1085
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range. A "
-"different wireless network will be used if any are available."
-msgstr ""
-"The requested wireless network '%s' does not appear to be in range. A "
-"different wireless network will be used if any are available."
-
#
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:265
#, c-format
msgid "Connection to the wireless network '%s' failed."
msgstr "Connection to the wireless network '%s' failed."
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:270
msgid "Connection to the wired network failed."
msgstr "Connection to the wired network failed."
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
-msgstr "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Error displaying connection information:"
-#: ../gnome/applet/applet.c:200
-#, fuzzy
+#: ../gnome/applet/applet.c:202
msgid "Could not find some required resources (the glade file)!"
-msgstr ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+msgstr "Could not find some required resources (the glade file)!"
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
msgid "No active connections!"
msgstr "No active connections!"
-#: ../gnome/applet/applet.c:226
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:234
+#, c-format
msgid "Wired Ethernet (%s)"
-msgstr "Wired Network (%s)"
+msgstr "Wired Ethernet (%s)"
-#: ../gnome/applet/applet.c:228
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:236
+#, c-format
msgid "Wireless Ethernet (%s)"
-msgstr "Wireless Network (%s)"
+msgstr "Wireless Ethernet (%s)"
-#: ../gnome/applet/applet.c:314 ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:358
msgid "NetworkManager Applet"
msgstr "NetworkManager Applet"
-#: ../gnome/applet/applet.c:316 ../gnome/applet/applet.c:334
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
-
-#: ../gnome/applet/applet.c:317 ../gnome/applet/applet.c:335
+#: ../gnome/applet/applet.c:334
msgid ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
msgstr ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:336
+#: ../gnome/applet/applet.c:362
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "Notification area applet for managing your network devices and connections."
#: ../gnome/applet/applet.c:339
+#: ../gnome/applet/applet.c:366
msgid "translator-credits"
-msgstr ""
-"David Lodge <dave@cirt.net>"
-"James Ogley <james@usr-local-bin.org>"
+msgstr "David Lodge <dave@cirt.net>James Ogley <james@usr-local-bin.org>"
-#: ../gnome/applet/applet.c:424
-msgid "VPN Error"
-msgstr "VPN Error"
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:422
msgid "VPN Login Failure"
msgstr "VPN Login Failure"
-#: ../gnome/applet/applet.c:429
+#: ../gnome/applet/applet.c:423
#, c-format
msgid "Could not start the VPN connection '%s' due to a login failure."
msgstr "Could not start the VPN connection '%s' due to a login failure."
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:427
msgid "VPN Start Failure"
msgstr "VPN Start Failure"
-#: ../gnome/applet/applet.c:434
+#: ../gnome/applet/applet.c:428
#, c-format
-msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
+msgstr "Could not start the VPN connection '%s' due to a failure launching the VPN program."
-#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:442
msgid "VPN Connect Failure"
msgstr "VPN Connect Failure"
-#: ../gnome/applet/applet.c:439
+#: ../gnome/applet/applet.c:433
#, c-format
msgid "Could not start the VPN connection '%s' due to a connection error."
msgstr "Could not start the VPN connection '%s' due to a connection error."
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:437
msgid "VPN Configuration Error"
msgstr "VPN Configuration Error"
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:438
#, c-format
msgid "The VPN connection '%s' was not correctly configured."
msgstr "The VPN connection '%s' was not correctly configured."
-#: ../gnome/applet/applet.c:449
-#, c-format
-msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-
-#: ../gnome/applet/applet.c:457
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "The VPN service said: \"%s\""
-
-#: ../gnome/applet/applet.c:526
+#: ../gnome/applet/applet.c:443
#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN connection '%s' said:"
+msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
+msgstr "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
-#: ../gnome/applet/applet.c:528
+#: ../gnome/applet/applet.c:513
msgid "VPN Login Message"
msgstr "VPN Login Message"
-#: ../gnome/applet/applet.c:746 ../gnome/applet/applet.c:2305
-#: ../gnome/applet/other-network-dialog.c:407
-#: ../gnome/applet/passphrase-dialog.c:384
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../gnome/applet/applet.c:737
+#: ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr "The NetworkManager Applet could not find some required resources (the glade file was not found)."
-#: ../gnome/applet/applet.c:759
+#: ../gnome/applet/applet.c:749
#, c-format
msgid "The network device \"%s (%s)\" does not support wireless scanning."
msgstr "The network device \"%s (%s)\" does not support wireless scanning."
-#: ../gnome/applet/applet.c:766
+#: ../gnome/applet/applet.c:757
#, c-format
msgid "The network device \"%s (%s)\" does not support link detection."
msgstr "The network device \"%s (%s)\" does not support link detection."
-#: ../gnome/applet/applet.c:914
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:904
+#, c-format
msgid "Preparing device %s for the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Preparing device %s for the wired network..."
#
-#: ../gnome/applet/applet.c:916
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:906
+#, c-format
msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Preparing device %s for the wireless network '%s'..."
-#: ../gnome/applet/applet.c:924
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:914
+#, c-format
msgid "Configuring device %s for the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Configuring device %s for the wired network..."
#
-#: ../gnome/applet/applet.c:926
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:916
+#, c-format
msgid "Attempting to join the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Attempting to join the wireless network '%s'..."
#
-#: ../gnome/applet/applet.c:934
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:924
+#, c-format
msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Waiting for Network Key for the wireless network '%s'..."
-#: ../gnome/applet/applet.c:942 ../gnome/applet/applet.c:952
-#, fuzzy
+#: ../gnome/applet/applet.c:932
+#: ../gnome/applet/applet.c:942
msgid "Requesting a network address from the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Requesting a network address from the wired network..."
#
-#: ../gnome/applet/applet.c:944 ../gnome/applet/applet.c:954
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:944
+#, c-format
msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Requesting a network address from the wireless network '%s'..."
-#: ../gnome/applet/applet.c:962
-#, fuzzy
+#: ../gnome/applet/applet.c:952
msgid "Finishing connection to the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Finishing connection to the wired network..."
#
-#: ../gnome/applet/applet.c:964
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:954
+#, c-format
msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Finishing connection to the wireless network '%s'..."
-#: ../gnome/applet/applet.c:1073
+#: ../gnome/applet/applet.c:1071
msgid "NetworkManager is not running"
msgstr "NetworkManager is not running"
-#: ../gnome/applet/applet.c:1085
+#: ../gnome/applet/applet.c:1079
+#: ../gnome/applet/applet.c:1824
+msgid "Networking disabled"
+msgstr "Networking disabled"
+
+#: ../gnome/applet/applet.c:1084
msgid "No network connection"
msgstr "No network connection"
-#: ../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1089
msgid "Wired network connection"
msgstr "Wired network connection"
#
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1093
msgid "Connected to an Ad-Hoc wireless network"
msgstr "Connected to an Ad-Hoc wireless network"
-#: ../gnome/applet/applet.c:1096
+#: ../gnome/applet/applet.c:1095
#, c-format
msgid "Wireless network connection to '%s' (%d%%)"
msgstr "Wireless network connection to '%s' (%d%%)"
-#: ../gnome/applet/applet.c:1118
+#: ../gnome/applet/applet.c:1116
#, c-format
msgid "VPN connection to '%s'"
msgstr "VPN connection to '%s'"
-#: ../gnome/applet/applet.c:1126
+#: ../gnome/applet/applet.c:1124
#, c-format
msgid "VPN connecting to '%s'"
msgstr "VPN connecting to '%s'"
-#: ../gnome/applet/applet.c:1510
+#: ../gnome/applet/applet.c:1537
msgid "_Connect to Other Wireless Network..."
msgstr "_Connect to Other Wireless Network..."
-#: ../gnome/applet/applet.c:1531
+#: ../gnome/applet/applet.c:1558
msgid "Create _New Wireless Network..."
msgstr "Create _New Wireless Network..."
-#: ../gnome/applet/applet.c:1644
+#: ../gnome/applet/applet.c:1681
msgid "_VPN Connections"
msgstr "_VPN Connections"
-#: ../gnome/applet/applet.c:1676
+#: ../gnome/applet/applet.c:1726
msgid "_Configure VPN..."
msgstr "_Configure VPN..."
-#: ../gnome/applet/applet.c:1680
+#: ../gnome/applet/applet.c:1730
msgid "_Disconnect VPN..."
msgstr "_Disconnect VPN..."
-#: ../gnome/applet/applet.c:1702
+#: ../gnome/applet/applet.c:1752
msgid "_Dial Up Connections"
msgstr "_Dial Up Connections"
-#: ../gnome/applet/applet.c:1711
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1763
#, c-format
msgid "Connect to %s..."
msgstr "Connect to %s..."
-#: ../gnome/applet/applet.c:1761
+#: ../gnome/applet/applet.c:1769
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Disconnect from %s..."
+
+#: ../gnome/applet/applet.c:1818
msgid "No network devices have been found"
msgstr "No network devices have been found"
-#: ../gnome/applet/applet.c:1923
+#: ../gnome/applet/applet.c:2010
msgid "NetworkManager is not running..."
msgstr "NetworkManager is not running..."
-#
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2025
-msgid "_Wireless Enabled"
-msgstr "_Wireless Enabled"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2166
+msgid "Enable _Networking"
+msgstr "Enable _Networking"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2172
+msgid "Enable _Wireless"
+msgstr "Enable _Wireless"
-#. Connection Information item
-#: ../gnome/applet/applet.c:2031
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2178
msgid "Connection _Information"
msgstr "Connection _Information"
#. Help item
-#: ../gnome/applet/applet.c:2041
+#: ../gnome/applet/applet.c:2189
msgid "_Help"
msgstr "_Help"
#. About item
-#: ../gnome/applet/applet.c:2049
+#: ../gnome/applet/applet.c:2198
msgid "_About"
msgstr "_About"
-#: ../gnome/applet/applet.c:2441
-msgid ""
-"The NetworkManager applet could not find some required resources. It cannot "
-"continue.\n"
-msgstr ""
-"The NetworkManager Applet could not find some required resources. It cannot "
-"continue.\n"
+#: ../gnome/applet/applet.c:2666
+msgid "The NetworkManager applet could not find some required resources. It cannot continue.\n"
+msgstr "The NetworkManager Applet could not find some required resources. It cannot continue.\n"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Open System"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Shared Key"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automatic (Default)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynamic WEP"
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "None"
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit Hex"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit Passphrase"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247
+#: ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Personal"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Personal"
+
+#: ../gnome/applet/eggtrayicon.c:134
msgid "Orientation"
msgstr "Orientation"
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
msgid "The orientation of the tray."
msgstr "The orientation of the tray."
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
#, c-format
msgid "Wired Network (%s)"
msgstr "Wired Network (%s)"
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
msgid "_Wired Network"
msgstr "_Wired Network"
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
#, c-format
msgid "Wireless Network (%s)"
msgid_plural "Wireless Networks (%s)"
@@ -347,149 +405,91 @@ msgstr[0] "Wireless Network (%s)"
msgstr[1] "Wireless Networks (%s)"
#
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
msgid "Wireless Network"
msgid_plural "Wireless Networks"
msgstr[0] "Wireless Network"
msgstr[1] "Wireless Networks"
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
msgid " (invalid Unicode)"
msgstr " (invalid Unicode)"
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/applet.glade.h:42
-msgid "_Passphrase:"
-msgstr "_Passphrase:"
-
-#: ../gnome/applet/other-network-dialog.c:146
-msgid "_ASCII Key:"
-msgstr "_ASCII Key:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-msgid "_Hex Key:"
-msgstr "_Hex Key:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled"
+msgstr "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled"
#
-#: ../gnome/applet/other-network-dialog.c:238
+#: ../gnome/applet/other-network-dialog.c:358
msgid "Create new wireless network"
msgstr "Create new wireless network"
-#: ../gnome/applet/other-network-dialog.c:239
-msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-
-#: ../gnome/applet/other-network-dialog.c:240
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "By default, the ESSID is set to your computer's name,"
+#: ../gnome/applet/other-network-dialog.c:359
+msgid "Enter the name and security settings of the wireless network you wish to create."
+msgstr "Enter the name and security settings of the wireless network you wish to create."
-#: ../gnome/applet/other-network-dialog.c:242
-msgid ", with no encryption enabled."
-msgstr ", with no encryption enabled."
-
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:363
msgid "Create New Wireless Network"
msgstr "Create New Wireless Network..."
#
-#: ../gnome/applet/other-network-dialog.c:249
-msgid "Custom wireless network"
-msgstr "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "Existing wireless network"
-#: ../gnome/applet/other-network-dialog.c:250
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Enter the name of the wireless network to which you wish to connect."
-#: ../gnome/applet/other-network-dialog.c:252
+#: ../gnome/applet/other-network-dialog.c:371
msgid "Connect to Other Wireless Network"
msgstr "Connect to Other Wireless Network"
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "Passphrase:"
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII Key:"
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Error connecting to wireless network"
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "Hex Key:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid "The requested wireless network requires security capabilities unsupported by your hardware."
+msgstr "The requested wireless network requires security capabilities unsupported by your hardware."
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
#, c-format
msgid "Cannot start VPN connection '%s'"
msgstr "Cannot start VPN connection '%s'"
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
+msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
+msgstr "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
#, c-format
-msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
-msgstr ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
+msgstr "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
#: ../gnome/applet/applet.glade.h:1
msgid " "
msgstr " "
#: ../gnome/applet/applet.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
msgstr "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
#, no-c-format
msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless Network</span>\n"
"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"A passphrase or encryption key is required to access the wireless network '%s'."
msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless Network</span>\n"
"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"A passphrase or encryption key is required to access the wireless network '%s'."
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
#, no-c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -500,178 +500,283 @@ msgstr ""
"\n"
"%s It will not be completely functional."
-#: ../gnome/applet/applet.glade.h:18
-#, fuzzy, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</span>\n"
"\n"
-"You have chosen to log in to the wireless network '%s'. If you are sure "
-"that this wireless network is secure, click the checkbox below and "
-"NetworkManager will not require confirmation on subsequent log ins."
+"You have chosen to log in to the wireless network '%s'. If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins."
msgstr ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</span>\n"
"\n"
-"You have chosen log in to the wireless network '%s'. If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"not require confirmation on subsequent connections."
+"You have chosen to log in to the wireless network '%s'. If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins."
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Anonymous Identity:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Authentication:"
+
+#: ../gnome/applet/applet.glade.h:17
msgid "Broadcast Address:"
msgstr "Broadcast Address:"
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA Certificate File:"
+
+#: ../gnome/applet/applet.glade.h:19
msgid "C_onnect"
msgstr "C_onnect"
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "Connect with _encryption enabled"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Client Certificate File:"
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
msgid "Connection Information"
msgstr "Connection Information"
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
msgid "Default Route:"
msgstr "Default Route:"
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:23
msgid "Destination Address:"
msgstr "Destination Address:"
-#: ../gnome/applet/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Driver:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP Method:"
+
+#: ../gnome/applet/applet.glade.h:26
msgid "Hardware Address:"
msgstr "Hardware Address:"
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:27
msgid "IP Address:"
msgstr "IP Address:"
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identity:"
+
#: ../gnome/applet/applet.glade.h:29
msgid "Interface:"
msgstr "Interface:"
#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Key Type:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Key management:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "Key:"
+
+#: ../gnome/applet/applet.glade.h:33
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Open System\n"
+"Shared Key"
+
+#: ../gnome/applet/applet.glade.h:40
msgid "Other Wireless Network..."
msgstr "Other Wireless Networks..."
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:43
msgid "Primary DNS:"
msgstr "Primary DNS:"
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "Private Key File:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "Private Key Password:"
+
+#: ../gnome/applet/applet.glade.h:46
msgid "Secondary DNS:"
msgstr "Secondary DNS:"
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "Select the CA Certificate File"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "Select the Client Certificate File"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "Select the Private Key File"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr "Show key"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr "Show passphrase"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr "Show password"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr "Show passwords"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "Speed:"
+
+#: ../gnome/applet/applet.glade.h:55
msgid "Subnet Mask:"
msgstr "Subnet Mask:"
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "Type:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "User Name:"
+
+#: ../gnome/applet/applet.glade.h:58
msgid "Wireless Network Key Required"
msgstr "Wireless Network Key Required"
#
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:59
msgid "Wireless _adapter:"
msgstr "Wireless _adapter:"
#
-#: ../gnome/applet/applet.glade.h:36
-msgid "Wireless _network:"
-msgstr "Wireless _network:"
-
-#
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:60
msgid "_Always Trust this Wireless Network"
msgstr "_Always Trust this Wireless Network"
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:61
msgid "_Don't remind me again"
msgstr "_Don't remind me again"
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Key Type:"
-msgstr "_Key Type:"
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Fallback on this Network"
-#: ../gnome/applet/applet.glade.h:40
-msgid "_Key type:"
-msgstr "_Key type:"
-
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:63
msgid "_Login to Network"
msgstr "_Login to Network"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "_Network Name:"
+
+#
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr "_Wireless Security:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:389
msgid "Cannot add VPN connection"
msgstr "Cannot add VPN connection"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
-msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
-msgstr ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
+#: ../gnome/vpn-properties/nm-vpn-properties.c:391
+msgid "No suitable VPN software was found on your system. Contact your system administrator."
+msgstr "No suitable VPN software was found on your system. Contact your system administrator."
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:433
msgid "Cannot import VPN connection"
msgstr "Cannot import VPN connection"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:435
#, c-format
-msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
-msgstr ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
+msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
+msgstr "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:555
#, c-format
msgid "Error retrieving VPN connection '%s'"
msgstr "Error retrieving VPN connection '%s'"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:558
#, c-format
-msgid ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
-msgstr ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
+msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
+msgstr "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:714
#, c-format
msgid "Delete VPN connection \"%s\"?"
msgstr "Delete VPN connection \"%s\"?"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:717
#, c-format
-msgid ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
-msgstr ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
+msgid "All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection."
+msgstr "All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection."
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:912
msgid "Unable to load"
msgstr "Unable to load"
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:914
msgid "Cannot find some needed resources (the glade file)!"
-msgstr ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+msgstr "Cannot find some needed resources (the glade file)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1059
+msgid "Create VPN Connection"
+msgstr "Create VPN Connection"
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
#. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1077
msgid "Edit VPN Connection"
msgstr "Edit VPN Connection"
@@ -680,157 +785,138 @@ msgid "Add a new VPN connection"
msgstr "Add a new VPN connection"
#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Choose which type of VPN connection you wish to create."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Connect to:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Create VPN Connection"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Create VPN Connection - 1 of 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Create VPN Connection - 2 of 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
msgid "Delete the selected VPN connection"
msgstr "Delete the selected VPN connection"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
msgid "E_xport"
msgstr "E_xport"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
msgid "Edit the selected VPN connection"
msgstr "Edit the selected VPN connection"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
msgid "Export the VPN settings to a file"
msgstr "Export the VPN settings to a file"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
msgid "Export the selected VPN connection to a file"
msgstr "Export the selected VPN connection to a file"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Finish Creating VPN Connection"
-
#
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
msgid "Manage Virtual Private Network Connections"
msgstr "Manage Virtual Private Network Connections"
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
-msgid ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN).\n"
-"\n"
-"It will require some information, such as IP addresses and secrets. Please "
-"see your system administrator to obtain this information."
-msgstr ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN).\n"
-"\n"
-"It will require some information, such as IP addresses and secrets. Please "
-"see your system administrator to obtain this information."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
msgid "VPN Connections"
msgstr "VPN Connections"
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bit WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bit WEP"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA Automatic"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 Automatic"
+
+#: ../src/nm-ap-security.c:338
+msgid "none"
+msgstr "none"
+
+#: ../src/nm-netlink-monitor.c:170
#, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "unable to create netlink socket for monitoring wired ethernet devices - %s"
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
#, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:425
msgid "operation took too long"
msgstr "operation took too long"
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:522
msgid "received data from wrong type of sender"
msgstr "received data from wrong type of sender"
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:535
msgid "received data from unexpected sender"
msgstr "received data from unexpected sender"
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:664
msgid "too much data was sent over socket and some of it was lost"
msgstr "too much data was sent over socket and some of it was lost"
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:774
msgid "error occurred while waiting for data on socket"
msgstr "error occurred while waiting for data on socket"
-#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
-#~ msgstr "<span weight=\"bold\">Wireless Networks:</span>"
-
-#~ msgid "Modify Wireless Networks"
-#~ msgstr "Modify Wireless Networks"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "You must log in to access the private network %s"
-#~ msgstr "You must log in to access the private network %s"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-#~ "\n"
-#~ "Could not start the VPN connection '%s' due to a login failure.\n"
-#~ "\n"
-#~ "The VPN service said: \"%s\""
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-#~ "\n"
-#~ "Could not start the VPN connection '%s' due to a login failure.\n"
-#~ "\n"
-#~ "The VPN service said: \"%s\""
-
-#~ msgid "Scanning for wireless networks..."
-#~ msgstr "Scanning for wireless networks..."
-
-#~ msgid "Pause Wireless Scanning"
-#~ msgstr "Pause Wireless Scanning"
-
-#~ msgid "Resume Wireless Scanning"
-#~ msgstr "Resume Wireless Scanning"
+#
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "You are now connected to the Ad-Hoc wireless network '%s'."
-#~ msgid "Stop All Wireless Devices"
-#~ msgstr "Stop All Wireless Devices"
+#
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "You are now connected to the wireless network '%s'."
-#~ msgid "Start All Wireless Devices"
-#~ msgstr "Start All Wireless Devices"
+#: ../gnome/applet/applet-dbus-devices.c:934
+msgid "You are now connected to the wired network."
+msgstr "You are now connected to the wired network."
-#~ msgid "_About..."
-#~ msgstr "_About..."
+#: ../gnome/applet/applet-dbus-devices.c:940
+msgid "Connection Established"
+msgstr "Connection Established"
-#~ msgid "progress bar label|%d %%"
-#~ msgstr "%d %%"
+#: ../gnome/applet/applet-dbus-devices.c:983
+msgid "Disconnected"
+msgstr "Disconnected"
-#~ msgid "_OK"
-#~ msgstr "_OK"
+#: ../gnome/applet/applet-dbus-devices.c:984
+msgid "The network connection has been disconnected."
+msgstr "The network connection has been disconnected."
-#~ msgid "You must log in to access the Virtual Private Network '%s'."
-#~ msgstr "You must log in to access the Virtual Private Network '%s'."
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range. A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "The requested wireless network '%s' does not appear to be in range. A "
+#~ "different wireless network will be used if any are available."
+#~ msgid "VPN Error"
+#~ msgstr "VPN Error"
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "The VPN service said: \"%s\""
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN connection '%s' said:"
-#~ msgid "%s"
-#~ msgstr "%s"