From 2543be81b95d11ba9b402d939f3f73ddf8ce195e Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 10 Jan 2006 03:19:41 +0000 Subject: [PATCH] 2006-01-09 Adam Weinberger * POTFILES.in: Added missing file. * en_CA.po: Updated Canadian English translation. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1305 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- po/ChangeLog | 5 ++ po/POTFILES.in | 1 + po/en_CA.po | 168 ++++++++++++++++++++++++++----------------------- 3 files changed, 97 insertions(+), 77 deletions(-) diff --git a/po/ChangeLog b/po/ChangeLog index 8559f8ff6d..46810e2e02 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Adam Weinberger + + * POTFILES.in: Added missing file. + * en_CA.po: Updated Canadian English translation. + 2006-01-07 Josep Puigdemont i Casamajó * ca.po: Updated Catalan translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 92f42fc4c3..f11ff6742e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,6 +17,7 @@ gnome/applet/other-network-dialog.c gnome/applet/passphrase-dialog.c gnome/applet/vpn-password-dialog.c gnome/applet/wireless-applet.glade +gnome/applet/wso-wpa-psk-hex.c gnome/vpn-properties/nm-vpn-properties.c gnome/vpn-properties/nm-vpn-properties.glade src/nm-ap-security-wep.c diff --git a/po/en_CA.po b/po/en_CA.po index b94baab0de..16ffc544f3 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,14 +1,14 @@ # Canadian English translation for NetworkManager -# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation +# Copyright (C) 2004-2006 Adam Weinberger and the GNOME Foundation # This file is distributed under the same licence as the NetworkManager package. -# Adam Weinberger, , 2004, 2005. +# Adam Weinberger, , 2004, 2005, 2006. # # msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-23 02:34-0500\n" +"POT-Creation-Date: 2006-01-09 22:19-0500\n" "PO-Revision-Date: 2005-09-06 14:52-0400\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Setup a request to the keyring to save the network passphrase -#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:846 +#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:934 #, c-format msgid "Passphrase for wireless network %s" msgstr "Passphrase for wireless network %s" @@ -32,64 +32,64 @@ msgstr "Connection to the wireless network '%s' failed." msgid "Connection to the wired network failed." msgstr "Connection to the wired network failed." -#: ../gnome/applet/applet.c:179 +#: ../gnome/applet/applet.c:180 msgid "Error displaying connection information: " msgstr "Error displaying connection information: " -#: ../gnome/applet/applet.c:198 +#: ../gnome/applet/applet.c:199 msgid "Could not find some required resources (the glade file)!" msgstr "Could not find some required resources (the glade file)!" -#: ../gnome/applet/applet.c:209 +#: ../gnome/applet/applet.c:210 msgid "No active connections!" msgstr "No active connections!" -#: ../gnome/applet/applet.c:224 +#: ../gnome/applet/applet.c:225 #, c-format msgid "Wired Ethernet (%s)" msgstr "Wired Ethernet (%s)" -#: ../gnome/applet/applet.c:226 +#: ../gnome/applet/applet.c:227 #, c-format msgid "Wireless Ethernet (%s)" msgstr "Wireless Ethernet (%s)" -#: ../gnome/applet/applet.c:319 ../gnome/applet/applet.c:344 +#: ../gnome/applet/applet.c:320 ../gnome/applet/applet.c:345 msgid "NetworkManager Applet" msgstr "NetworkManager Applet" -#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346 +#: ../gnome/applet/applet.c:322 ../gnome/applet/applet.c:347 msgid "Copyright © 2004-2005 Red Hat, Inc." msgstr "Copyright © 2004-2005 Red Hat, Inc." -#: ../gnome/applet/applet.c:322 ../gnome/applet/applet.c:347 +#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348 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:325 ../gnome/applet/applet.c:352 +#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:353 msgid "translator-credits" msgstr "Adam Weinberger " -#: ../gnome/applet/applet.c:437 +#: ../gnome/applet/applet.c:438 msgid "VPN Error" msgstr "VPN Error" -#: ../gnome/applet/applet.c:441 +#: ../gnome/applet/applet.c:442 msgid "VPN Login Failure" msgstr "VPN Login Failure" -#: ../gnome/applet/applet.c:442 +#: ../gnome/applet/applet.c:443 #, 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:446 +#: ../gnome/applet/applet.c:447 msgid "VPN Start Failure" msgstr "VPN Start Failure" -#: ../gnome/applet/applet.c:447 +#: ../gnome/applet/applet.c:448 #, c-format msgid "" "Could not start the VPN connection '%s' due to a failure launching the VPN " @@ -98,25 +98,25 @@ msgstr "" "Could not start the VPN connection '%s' due to a failure launching the VPN " "program." -#: ../gnome/applet/applet.c:451 ../gnome/applet/applet.c:461 +#: ../gnome/applet/applet.c:452 ../gnome/applet/applet.c:462 msgid "VPN Connect Failure" msgstr "VPN Connect Failure" -#: ../gnome/applet/applet.c:452 +#: ../gnome/applet/applet.c:453 #, 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:456 +#: ../gnome/applet/applet.c:457 msgid "VPN Configuration Error" msgstr "VPN Configuration Error" -#: ../gnome/applet/applet.c:457 +#: ../gnome/applet/applet.c:458 #, c-format msgid "The VPN connection '%s' was not correctly configured." msgstr "The VPN connection '%s' was not correctly configured." -#: ../gnome/applet/applet.c:462 +#: ../gnome/applet/applet.c:463 #, c-format msgid "" "Could not start the VPN connection '%s' because the VPN server did not " @@ -125,23 +125,23 @@ msgstr "" "Could not start the VPN connection '%s' because the VPN server did not " "return an adequate network configuration." -#: ../gnome/applet/applet.c:470 +#: ../gnome/applet/applet.c:471 #, c-format msgid "The VPN service said: \"%s\"" msgstr "The VPN service said: \"%s\"" -#: ../gnome/applet/applet.c:539 +#: ../gnome/applet/applet.c:540 #, c-format msgid "VPN connection '%s' said:" msgstr "VPN connection '%s' said:" -#: ../gnome/applet/applet.c:541 +#: ../gnome/applet/applet.c:542 msgid "VPN Login Message" msgstr "VPN Login Message" -#: ../gnome/applet/applet.c:759 ../gnome/applet/applet.c:2363 -#: ../gnome/applet/other-network-dialog.c:379 -#: ../gnome/applet/passphrase-dialog.c:351 +#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2451 +#: ../gnome/applet/other-network-dialog.c:448 +#: ../gnome/applet/passphrase-dialog.c:210 msgid "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." @@ -149,148 +149,154 @@ msgstr "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." -#: ../gnome/applet/applet.c:771 +#: ../gnome/applet/applet.c:772 #, 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:779 +#: ../gnome/applet/applet.c:780 #, 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:919 +#: ../gnome/applet/applet.c:928 #, c-format msgid "Preparing device %s for the wired network..." msgstr "Preparing device %s for the wired network..." -#: ../gnome/applet/applet.c:921 +#: ../gnome/applet/applet.c:930 #, c-format msgid "Preparing device %s for the wireless network '%s'..." msgstr "Preparing device %s for the wireless network '%s'..." -#: ../gnome/applet/applet.c:929 +#: ../gnome/applet/applet.c:938 #, c-format msgid "Configuring device %s for the wired network..." msgstr "Configuring device %s for the wired network..." -#: ../gnome/applet/applet.c:931 +#: ../gnome/applet/applet.c:940 #, c-format msgid "Attempting to join the wireless network '%s'..." msgstr "Attempting to join the wireless network '%s'..." -#: ../gnome/applet/applet.c:939 +#: ../gnome/applet/applet.c:948 #, c-format msgid "Waiting for Network Key for the wireless network '%s'..." msgstr "Waiting for Network Key for the wireless network '%s'..." -#: ../gnome/applet/applet.c:947 ../gnome/applet/applet.c:957 +#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966 msgid "Requesting a network address from the wired network..." msgstr "Requesting a network address from the wired network..." -#: ../gnome/applet/applet.c:949 ../gnome/applet/applet.c:959 +#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968 #, c-format msgid "Requesting a network address from the wireless network '%s'..." msgstr "Requesting a network address from the wireless network '%s'..." -#: ../gnome/applet/applet.c:967 +#: ../gnome/applet/applet.c:976 msgid "Finishing connection to the wired network..." msgstr "Finishing connection to the wired network..." -#: ../gnome/applet/applet.c:969 +#: ../gnome/applet/applet.c:978 #, c-format msgid "Finishing connection to the wireless network '%s'..." msgstr "Finishing connection to the wireless network '%s'..." -#: ../gnome/applet/applet.c:1086 +#: ../gnome/applet/applet.c:1095 msgid "NetworkManager is not running" msgstr "NetworkManager is not running" -#: ../gnome/applet/applet.c:1098 +#: ../gnome/applet/applet.c:1107 msgid "No network connection" msgstr "No network connection" -#: ../gnome/applet/applet.c:1103 +#: ../gnome/applet/applet.c:1112 msgid "Wired network connection" msgstr "Wired network connection" -#: ../gnome/applet/applet.c:1107 +#: ../gnome/applet/applet.c:1116 msgid "Connected to an Ad-Hoc wireless network" msgstr "Connected to an Ad-Hoc wireless network" -#: ../gnome/applet/applet.c:1109 +#: ../gnome/applet/applet.c:1118 #, c-format msgid "Wireless network connection to '%s' (%d%%)" msgstr "Wireless network connection to '%s' (%d%%)" -#: ../gnome/applet/applet.c:1131 +#: ../gnome/applet/applet.c:1140 #, c-format msgid "VPN connection to '%s'" msgstr "VPN connection to '%s'" -#: ../gnome/applet/applet.c:1139 +#: ../gnome/applet/applet.c:1148 #, c-format msgid "VPN connecting to '%s'" msgstr "VPN connecting to '%s'" -#: ../gnome/applet/applet.c:1529 +#: ../gnome/applet/applet.c:1562 msgid "_Connect to Other Wireless Network..." msgstr "_Connect to Other Wireless Network..." -#: ../gnome/applet/applet.c:1550 +#: ../gnome/applet/applet.c:1583 msgid "Create _New Wireless Network..." msgstr "Create _New Wireless Network..." -#: ../gnome/applet/applet.c:1663 +#: ../gnome/applet/applet.c:1700 msgid "_VPN Connections" msgstr "_VPN Connections" -#: ../gnome/applet/applet.c:1695 +#: ../gnome/applet/applet.c:1735 msgid "_Configure VPN..." msgstr "_Configure VPN..." -#: ../gnome/applet/applet.c:1699 +#: ../gnome/applet/applet.c:1739 msgid "_Disconnect VPN..." msgstr "_Disconnect VPN..." -#: ../gnome/applet/applet.c:1721 +#: ../gnome/applet/applet.c:1761 msgid "_Dial Up Connections" msgstr "_Dial-Up Connections" -#: ../gnome/applet/applet.c:1730 +#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item +#: ../gnome/applet/applet.c:1772 #, c-format msgid "Connect to %s..." msgstr "Connect to %s..." -#: ../gnome/applet/applet.c:1780 +#: ../gnome/applet/applet.c:1778 +#, c-format +msgid "Disconnect from %s..." +msgstr "Disconnect from %s..." + +#: ../gnome/applet/applet.c:1827 msgid "No network devices have been found" msgstr "No network devices have been found" -#: ../gnome/applet/applet.c:1954 +#: ../gnome/applet/applet.c:2001 msgid "NetworkManager is not running..." msgstr "NetworkManager is not running..." #. 'Enable Wireless' item -#: ../gnome/applet/applet.c:2079 +#: ../gnome/applet/applet.c:2126 msgid "Enable _Wireless" msgstr "Enable _Wireless" #. 'Connection Information' item -#: ../gnome/applet/applet.c:2085 +#: ../gnome/applet/applet.c:2132 msgid "Connection _Information" msgstr "Connection _Information" #. Help item -#: ../gnome/applet/applet.c:2096 +#: ../gnome/applet/applet.c:2143 msgid "_Help" msgstr "_Help" #. About item -#: ../gnome/applet/applet.c:2105 +#: ../gnome/applet/applet.c:2152 msgid "_About" msgstr "_About" -#: ../gnome/applet/applet.c:2483 +#: ../gnome/applet/applet.c:2570 msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" @@ -306,7 +312,7 @@ msgstr "Open System" msgid "Shared Key" msgstr "Shared Key" -#: ../gnome/applet/wso-none.c:51 +#: ../gnome/applet/wso-none.c:53 msgid "None" msgstr "None" @@ -356,11 +362,11 @@ msgid_plural "Wireless Networks" msgstr[0] "Wireless Network" msgstr[1] "Wireless Networks" -#: ../gnome/applet/menu-items.c:326 +#: ../gnome/applet/menu-items.c:330 msgid " (invalid Unicode)" msgstr " (invalid Unicode)" -#: ../gnome/applet/other-network-dialog.c:248 +#: ../gnome/applet/other-network-dialog.c:347 #, c-format msgid "" "By default, the ESSID is set to your computer's name, %s, with no encryption " @@ -369,11 +375,11 @@ msgstr "" "By default, the ESSID is set to your computer's name, %s, with no encryption " "enabled" -#: ../gnome/applet/other-network-dialog.c:252 +#: ../gnome/applet/other-network-dialog.c:351 msgid "Create new wireless network" msgstr "Create new wireless network" -#: ../gnome/applet/other-network-dialog.c:253 +#: ../gnome/applet/other-network-dialog.c:352 msgid "" "Enter the ESSID and security settings of the wireless network you wish to " "create." @@ -381,19 +387,19 @@ msgstr "" "Enter the ESSID and security settings of the wireless network you wish to " "create." -#: ../gnome/applet/other-network-dialog.c:257 +#: ../gnome/applet/other-network-dialog.c:356 msgid "Create New Wireless Network" msgstr "Create New Wireless Network" -#: ../gnome/applet/other-network-dialog.c:262 +#: ../gnome/applet/other-network-dialog.c:361 msgid "Custom wireless network" msgstr "Custom wireless network" -#: ../gnome/applet/other-network-dialog.c:263 +#: ../gnome/applet/other-network-dialog.c:362 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:265 +#: ../gnome/applet/other-network-dialog.c:364 msgid "Connect to Other Wireless Network" msgstr "Connect to Other Wireless Network" @@ -603,8 +609,16 @@ msgid "wep_passphrase_subwindow" msgstr "wep_passphrase_subwindow" #: ../gnome/applet/wireless-applet.glade.h:49 -msgid "wpa_psk_subwindow" -msgstr "wpa_psk_subwindow" +msgid "wpa_psk_hex_subwindow" +msgstr "wpa_psk_hex_subwindow" + +#: ../gnome/applet/wireless-applet.glade.h:50 +msgid "wpa_psk_passphrase_subwindow" +msgstr "wpa_psk_passphrase_subwindow" + +#: ../gnome/applet/wso-wpa-psk-hex.c:113 +msgid "WPA Personal Hex" +msgstr "WPA Personal Hex" #: ../gnome/vpn-properties/nm-vpn-properties.c:370 msgid "Cannot add VPN connection" @@ -744,23 +758,23 @@ msgstr "" msgid "VPN Connections" msgstr "VPN Connections" -#: ../src/nm-ap-security-wep.c:45 +#: ../src/nm-ap-security-wep.c:47 msgid "40-bit WEP" msgstr "40-bit WEP" -#: ../src/nm-ap-security-wep.c:47 +#: ../src/nm-ap-security-wep.c:49 msgid "104-bit WEP" msgstr "104-bit WEP" -#: ../src/nm-ap-security-wpa-psk.c:64 +#: ../src/nm-ap-security-wpa-psk.c:47 msgid "WPA TKIP" msgstr "WPA TKIP" -#: ../src/nm-ap-security-wpa-psk.c:66 +#: ../src/nm-ap-security-wpa-psk.c:49 msgid "WPA CCMP" msgstr "WPA CCMP" -#: ../src/nm-ap-security.c:297 +#: ../src/nm-ap-security.c:309 msgid "none" msgstr "none"