2006-01-17 Adam Weinberger <adamw@gnome.org>

	* POTFILES.in: Added missing file.
	* en_CA.po: Updated Canadian English translation.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1354 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

1 files changed, 87 insertions, 95 deletions

diff --git a/po/en_CA.po b/po/en_CA.po
index e9f472d57c..ef3431a055 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-15 23:41-0500\n"
+"POT-Creation-Date: 2006-01-17 19:56-0500\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -53,42 +53,42 @@ msgstr "Wired Ethernet (%s)"
 msgid "Wireless Ethernet (%s)"
 msgstr "Wireless Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:320 ../gnome/applet/applet.c:345
+#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../gnome/applet/applet.c:322 ../gnome/applet/applet.c:347
+#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
 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:326 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
 msgid "translator-credits"
 msgstr "Adam Weinberger <adamw@gnome.org>"
 
-#: ../gnome/applet/applet.c:438
+#: ../gnome/applet/applet.c:439
 msgid "VPN Error"
 msgstr "VPN Error"
 
-#: ../gnome/applet/applet.c:442
+#: ../gnome/applet/applet.c:443
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:444
 #, 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:447
+#: ../gnome/applet/applet.c:448
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:449
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -97,25 +97,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../gnome/applet/applet.c:452 ../gnome/applet/applet.c:462
+#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:453
+#: ../gnome/applet/applet.c:454
 #, 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:457
+#: ../gnome/applet/applet.c:458
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:459
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:464
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -124,23 +124,23 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../gnome/applet/applet.c:471
+#: ../gnome/applet/applet.c:472
 #, c-format
 msgid "The VPN service said: \"%s\""
 msgstr "The VPN service said: \"%s\""
 
-#: ../gnome/applet/applet.c:540
+#: ../gnome/applet/applet.c:541
 #, c-format
 msgid "VPN connection '%s' said:"
 msgstr "VPN connection '%s' said:"
 
-#: ../gnome/applet/applet.c:542
+#: ../gnome/applet/applet.c:543
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2511
-#: ../gnome/applet/other-network-dialog.c:455
-#: ../gnome/applet/passphrase-dialog.c:210
+#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
+#: ../gnome/applet/other-network-dialog.c:457
+#: ../gnome/applet/passphrase-dialog.c:209
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -205,7 +205,7 @@ msgstr "Finishing connection to the wireless network '%s'..."
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1839
+#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1842
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
@@ -236,75 +236,75 @@ msgstr "VPN connection to '%s'"
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../gnome/applet/applet.c:1568
+#: ../gnome/applet/applet.c:1567
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../gnome/applet/applet.c:1589
+#: ../gnome/applet/applet.c:1588
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../gnome/applet/applet.c:1706
+#: ../gnome/applet/applet.c:1709
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../gnome/applet/applet.c:1741
+#: ../gnome/applet/applet.c:1744
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1748
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../gnome/applet/applet.c:1767
+#: ../gnome/applet/applet.c:1770
 msgid "_Dial Up Connections"
 msgstr "_Dial-Up Connections"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1778
+#: ../gnome/applet/applet.c:1781
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../gnome/applet/applet.c:1784
+#: ../gnome/applet/applet.c:1787
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Disconnect from %s..."
 
-#: ../gnome/applet/applet.c:1833
+#: ../gnome/applet/applet.c:1836
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../gnome/applet/applet.c:2025
+#: ../gnome/applet/applet.c:2028
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2181
+#: ../gnome/applet/applet.c:2184
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2187
+#: ../gnome/applet/applet.c:2190
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2193
+#: ../gnome/applet/applet.c:2196
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2204
+#: ../gnome/applet/applet.c:2207
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../gnome/applet/applet.c:2213
+#: ../gnome/applet/applet.c:2216
 msgid "_About"
 msgstr "_About"
 
-#: ../gnome/applet/applet.c:2630
+#: ../gnome/applet/applet.c:2633
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -325,8 +325,8 @@ msgid "TKIP (Default)"
 msgstr "TKIP (Default)"
 
 #: ../gnome/applet/wireless-security-option.c:221
-msgid "CCMP/AES"
-msgstr "CCMP/AES"
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
@@ -344,15 +344,11 @@ msgstr "WEP 40/128-bit hex"
 msgid "WEP Passphrase"
 msgstr "WEP Passphrase"
 
-#: ../gnome/applet/wso-wpa-psk-passphrase.c:153
-msgid "WPA Preshared-Key Passphrase"
-msgstr "WPA Preshared-Key Passphrase"
-
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
@@ -385,37 +381,37 @@ msgstr " (invalid Unicode)"
 #: ../gnome/applet/other-network-dialog.c:354
 #, c-format
 msgid ""
-"By default, the ESSID is set to your computer's name, %s, with no encryption "
-"enabled"
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
-"By default, the ESSID is set to your computer's name, %s, with no encryption "
-"enabled"
+"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:358
+#: ../gnome/applet/other-network-dialog.c:360
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: ../gnome/applet/other-network-dialog.c:359
+#: ../gnome/applet/other-network-dialog.c:361
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name 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 "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: ../gnome/applet/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:365
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Network"
 
-#: ../gnome/applet/other-network-dialog.c:368
-msgid "Custom wireless network"
-msgstr "Custom wireless network"
-
-#: ../gnome/applet/other-network-dialog.c:369
-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:370
+msgid "Existing wireless network"
+msgstr "Existing wireless network"
 
 #: ../gnome/applet/other-network-dialog.c:371
+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:373
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
@@ -509,34 +505,38 @@ msgid "C_onnect"
 msgstr "C_onnect"
 
 #: ../gnome/applet/wireless-applet.glade.h:18
+msgid "Connect using WPA2"
+msgstr "Connect using WPA2"
+
+#: ../gnome/applet/wireless-applet.glade.h:19
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../gnome/applet/wireless-applet.glade.h:19
+#: ../gnome/applet/wireless-applet.glade.h:20
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../gnome/applet/wireless-applet.glade.h:20
+#: ../gnome/applet/wireless-applet.glade.h:21
 msgid "Destination Address:"
 msgstr "Destination Address:"
 
-#: ../gnome/applet/wireless-applet.glade.h:21
+#: ../gnome/applet/wireless-applet.glade.h:22
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../gnome/applet/wireless-applet.glade.h:22
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "IP Address:"
 msgstr "IP Address:"
 
-#: ../gnome/applet/wireless-applet.glade.h:23
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../gnome/applet/wireless-applet.glade.h:24
+#: ../gnome/applet/wireless-applet.glade.h:25
 msgid "Key:"
 msgstr "Key:"
 
-#: ../gnome/applet/wireless-applet.glade.h:25
+#: ../gnome/applet/wireless-applet.glade.h:26
 msgid ""
 "None\n"
 "WEP Passphrase\n"
@@ -548,7 +548,7 @@ msgstr ""
 "WEP 40/128-bit hex\n"
 "WEP 40/128-bit ASCII\n"
 
-#: ../gnome/applet/wireless-applet.glade.h:30
+#: ../gnome/applet/wireless-applet.glade.h:31
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -556,38 +556,34 @@ msgstr ""
 "Open System\n"
 "Shared Key"
 
-#: ../gnome/applet/wireless-applet.glade.h:32
+#: ../gnome/applet/wireless-applet.glade.h:33
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Network..."
 
-#: ../gnome/applet/wireless-applet.glade.h:33
+#: ../gnome/applet/wireless-applet.glade.h:34
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: ../gnome/applet/wireless-applet.glade.h:34
+#: ../gnome/applet/wireless-applet.glade.h:35
 msgid "Password:"
 msgstr "Password:"
 
-#: ../gnome/applet/wireless-applet.glade.h:35
+#: ../gnome/applet/wireless-applet.glade.h:36
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../gnome/applet/wireless-applet.glade.h:36
+#: ../gnome/applet/wireless-applet.glade.h:37
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../gnome/applet/wireless-applet.glade.h:37
+#: ../gnome/applet/wireless-applet.glade.h:38
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../gnome/applet/wireless-applet.glade.h:38
+#: ../gnome/applet/wireless-applet.glade.h:39
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gnome/applet/wireless-applet.glade.h:39
-msgid "Use WPA Enterprise (WPA2)"
-msgstr "Use WPA Enterprise (WPA2)"
-
 #: ../gnome/applet/wireless-applet.glade.h:40
 msgid "User Name:"
 msgstr "User Name:"
@@ -633,16 +629,12 @@ msgid "wep_passphrase_subwindow"
 msgstr "wep_passphrase_subwindow"
 
 #: ../gnome/applet/wireless-applet.glade.h:51
-msgid "wpa_psk_hex_subwindow"
-msgstr "wpa_psk_hex_subwindow"
-
-#: ../gnome/applet/wireless-applet.glade.h:52
-msgid "wpa_psk_passphrase_subwindow"
-msgstr "wpa_psk_passphrase_subwindow"
+msgid "wpa_psk_subwindow"
+msgstr "wpa_psk_subwindow"
 
-#: ../gnome/applet/wso-wpa-psk-hex.c:153
-msgid "WPA Preshared-Key Hex"
-msgstr "WPA Preshared-Key Hex"
+#: ../gnome/applet/wso-wpa-psk.c:165
+msgid "WPA/WPA2 Personal"
+msgstr "WPA/WPA2 Personal"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:358
 msgid "Cannot add VPN connection"
@@ -824,22 +816,22 @@ msgid ""
 msgstr ""
 "Unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "Operation took too long"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 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:515
 msgid "received data from unexpected sender"
 msgstr "Received data from unexpected sender"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 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:735
 msgid "error occurred while waiting for data on socket"
 msgstr "error occurred while waiting for data on socket"