merge with code

1 files changed, 99 insertions, 71 deletions

diff --git a/po/drakx-net.pot b/po/drakx-net.pot
index 1a24a6a..10d7972 100644
--- a/po/drakx-net.pot
+++ b/po/drakx-net.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-20 13:26+0100\n"
+"POT-Creation-Date: 2013-02-19 20:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3209,87 +3209,87 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:292
+#: ../lib/network/connection/wireless.pm:284
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:358
 #, c-format
 msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:448
 #, c-format
 msgid "Wireless settings"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:461 ../lib/network/connection_manager.pm:281 ../lib/network/drakconnect/edit.pm:236
+#: ../lib/network/connection/wireless.pm:453 ../lib/network/connection_manager.pm:281 ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465 ../lib/network/drakconnect/edit.pm:237
+#: ../lib/network/connection/wireless.pm:457 ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:467
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:469 ../lib/network/drakconnect/edit.pm:251
+#: ../lib/network/connection/wireless.pm:461 ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Hide password"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:473
 #, c-format
 msgid "EAP Login/Username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3297,12 +3297,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid "EAP Password"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3321,12 +3321,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:503
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3335,32 +3335,60 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:509 ../lib/network/drakconnect/edit.pm:238
+#: ../lib/network/connection/wireless.pm:501
+#, c-format
+msgid "EAP client private key"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:503
+#, c-format
+msgid ""
+"The complete path and filename of client private key. This is\n"
+"only used for EAP certificate based authentication. It could be\n"
+"considered as the alternative to username/password combo.\n"
+" Note: other related settings are shown on the Advanced page."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:507
+#, c-format
+msgid "EAP client private key password"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:509
+#, c-format
+msgid ""
+"The complete password for the client private key. This is\n"
+"only used for EAP certificate based authentication. This password \n"
+"is used for protected client private keys only. It can be optional.\n"
+" Note: other related settings are shown on the Advanced page."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:513 ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:510 ../lib/network/drakconnect/edit.pm:239
+#: ../lib/network/connection/wireless.pm:514 ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:511 ../lib/network/drakconnect/edit.pm:240
+#: ../lib/network/connection/wireless.pm:515 ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512 ../lib/network/drakconnect/edit.pm:241
+#: ../lib/network/connection/wireless.pm:516 ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513 ../lib/network/drakconnect/edit.pm:252
+#: ../lib/network/connection/wireless.pm:517 ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -3371,17 +3399,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:521 ../lib/network/drakconnect/edit.pm:253
+#: ../lib/network/connection/wireless.pm:525 ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:522 ../lib/network/drakconnect/edit.pm:254
+#: ../lib/network/connection/wireless.pm:526 ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3391,12 +3419,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:530 ../lib/network/drakconnect/edit.pm:255
+#: ../lib/network/connection/wireless.pm:534 ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:535
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3408,12 +3436,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:539 ../lib/network/drakconnect/edit.pm:256
+#: ../lib/network/connection/wireless.pm:543 ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:545
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless network\n"
@@ -3428,106 +3456,106 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "EAP Protocol"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:553 ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:557 ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "Auto Detect"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:557
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:557
 #, c-format
 msgid "WPA"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:559
 #, 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:557
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "EAP Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "PEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "MSCHAPV2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:564
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3535,12 +3563,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:571
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3549,12 +3577,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:581
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3564,12 +3592,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:582
+#: ../lib/network/connection/wireless.pm:586
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:584
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3579,12 +3607,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:589
+#: ../lib/network/connection/wireless.pm:593
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:590
+#: ../lib/network/connection/wireless.pm:594
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3602,42 +3630,42 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:614
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:621
 #, 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:623
+#: ../lib/network/connection/wireless.pm:627
 #, c-format
 msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:630
+#: ../lib/network/connection/wireless.pm:634
 #, 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:636
+#: ../lib/network/connection/wireless.pm:640
 #, 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:648
+#: ../lib/network/connection/wireless.pm:652
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:773
+#: ../lib/network/connection/wireless.pm:777
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:774
+#: ../lib/network/connection/wireless.pm:778
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""