sync with code

1 files changed, 121 insertions, 102 deletions

diff --git a/po/fur.po b/po/fur.po
index f5310ac..376aea2 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-03-17 15:16+0100\n"
+"POT-Creation-Date: 2008-04-02 16:11+0200\n"
 "PO-Revision-Date: 2004-06-28 17:41+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -89,7 +89,7 @@ msgstr "Scancele"
 msgid "Ok"
 msgstr "Va ben"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:359 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
 #: ../lib/network/connection_manager.pm:186
@@ -402,29 +402,29 @@ msgstr ""
 msgid "Cache size (MB)"
 msgstr ""
 
-#: ../bin/drakgw:296
+#: ../bin/drakgw:292
 #, fuzzy, c-format
 msgid "Broadcast printer information"
 msgstr "Informazions minudis"
 
-#: ../bin/drakgw:307
+#: ../bin/drakgw:303
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr ""
 
-#: ../bin/drakgw:313
+#: ../bin/drakgw:309
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: ../bin/drakgw:319
+#: ../bin/drakgw:315
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: ../bin/drakgw:325
+#: ../bin/drakgw:321
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -433,29 +433,29 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:344
 #, c-format
 msgid "Disabling servers..."
 msgstr ""
 
-#: ../bin/drakgw:373
+#: ../bin/drakgw:358
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr ""
 
-#: ../bin/drakgw:374
+#: ../bin/drakgw:359
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
 
-#: ../bin/drakgw:379
+#: ../bin/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr ""
 
-#: ../bin/drakgw:380
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring firewall..."
 msgstr ""
@@ -589,8 +589,8 @@ msgstr "Permet ducj i utents"
 #: ../bin/drakids:40 ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196
 #: ../bin/drakids:221 ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
 #: ../bin/net_applet:76 ../bin/net_applet:239 ../bin/net_applet:515
-#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:259
-#: ../lib/network/drakfirewall.pm:263
+#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:262
+#: ../lib/network/drakfirewall.pm:266
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall"
@@ -3288,7 +3288,7 @@ msgid "Address settings"
 msgstr ""
 
 #: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:40 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
@@ -3965,100 +3965,105 @@ msgstr ""
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:41
+#: ../lib/network/connection/wireless.pm:43
 #, c-format
 msgid "Open WEP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:42
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Restricted WEP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:231
+#: ../lib/network/connection/wireless.pm:234
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:298
+#: ../lib/network/connection/wireless.pm:301
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:361
+#: ../lib/network/connection/wireless.pm:366
 #, c-format
 msgid "Wireless settings"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:371
 #: ../lib/network/connection_manager.pm:243
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:370
+#: ../lib/network/connection/wireless.pm:375
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:377
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:374
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid "Encryption key"
 msgstr "Clâf di cifradure"
 
-#: ../lib/network/connection/wireless.pm:376
+#: ../lib/network/connection/wireless.pm:381
+#, c-format
+msgid "Force using this key as ASCII string (e.g. for Livebox)"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:388
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Non utent"
 
-#: ../lib/network/connection/wireless.pm:378
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4066,12 +4071,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:393
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:383
+#: ../lib/network/connection/wireless.pm:395
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4090,12 +4095,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:397
+#: ../lib/network/connection/wireless.pm:409
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:399
+#: ../lib/network/connection/wireless.pm:411
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4104,32 +4109,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:403
+#: ../lib/network/connection/wireless.pm:415
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:404
+#: ../lib/network/connection/wireless.pm:416
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:405
+#: ../lib/network/connection/wireless.pm:417
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:406
+#: ../lib/network/connection/wireless.pm:418
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:407
+#: ../lib/network/connection/wireless.pm:419
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:408
+#: ../lib/network/connection/wireless.pm:420
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4143,17 +4148,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:427
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:428
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:429
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4164,12 +4169,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:424
+#: ../lib/network/connection/wireless.pm:436
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:425
+#: ../lib/network/connection/wireless.pm:437
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4181,12 +4186,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:433
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:435
+#: ../lib/network/connection/wireless.pm:447
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4204,107 +4209,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:446
+#: ../lib/network/connection/wireless.pm:458
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocol"
 
-#: ../lib/network/connection/wireless.pm:447
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Auto Detect"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:449
+#: ../lib/network/connection/wireless.pm:461
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:451
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "EAP Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MSCHAPV2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:454
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:460
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4312,12 +4317,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4326,12 +4331,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4341,12 +4346,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:476
+#: ../lib/network/connection/wireless.pm:488
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4356,12 +4361,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:485
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4379,36 +4384,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:524
+#, c-format
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:530
+#, c-format
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:537
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:543
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:665
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:640
+#: ../lib/network/connection/wireless.pm:666
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4603,13 +4622,13 @@ msgstr ""
 msgid "Port scan detection"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:169 ../lib/network/drakfirewall.pm:175
 #: ../lib/network/shorewall.pm:63
 #, fuzzy, c-format
 msgid "Firewall configuration"
 msgstr "Configurazion Xorg"
 
-#: ../lib/network/drakfirewall.pm:166
+#: ../lib/network/drakfirewall.pm:169
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4619,7 +4638,7 @@ msgid ""
 "specialized Mandriva Security Firewall distribution."
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:175
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4628,18 +4647,18 @@ msgid ""
 "drakconnect before going any further."
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:189
+#: ../lib/network/drakfirewall.pm:192
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:190 ../lib/network/drakfirewall.pm:192
-#: ../lib/network/shorewall.pm:150
+#: ../lib/network/drakfirewall.pm:193 ../lib/network/drakfirewall.pm:195
+#: ../lib/network/shorewall.pm:152
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: ../lib/network/drakfirewall.pm:193
+#: ../lib/network/drakfirewall.pm:196
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -4647,7 +4666,7 @@ msgid ""
 "Have a look at /etc/services for information."
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:199
+#: ../lib/network/drakfirewall.pm:202
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -4657,22 +4676,22 @@ msgid ""
 "You can also give a range of ports (eg: 24300:24350/udp)"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:209
+#: ../lib/network/drakfirewall.pm:212
 #, c-format
 msgid "Everything (no firewall)"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:211
+#: ../lib/network/drakfirewall.pm:214
 #, c-format
 msgid "Other ports"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:212
+#: ../lib/network/drakfirewall.pm:215
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:261
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4680,7 +4699,7 @@ msgid ""
 "Please select which network activities should be watched."
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr ""
@@ -5575,17 +5594,17 @@ msgid ""
 "Which interfaces should be protected?\n"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:141
+#: ../lib/network/shorewall.pm:143
 #, c-format
 msgid "Keep custom rules"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:142
+#: ../lib/network/shorewall.pm:144
 #, c-format
 msgid "Drop custom rules"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:147
+#: ../lib/network/shorewall.pm:149
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"