sync with code

71 files changed, 20612 insertions, 3775 deletions

diff --git a/po/af.po b/po/af.po
index 0d16030..e62a6cc 100644
--- a/po/af.po
+++ b/po/af.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-af\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-04-21 17:33+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -2034,12 +2034,7 @@ msgstr "Geluk"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2415,12 +2410,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2485,7 +2475,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4680,12 +4682,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4732,7 +4739,58 @@ msgstr "Outo"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Gebruikerskode"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Wagwoord"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Naam van die sertifikaat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4813,7 +4871,182 @@ msgstr ""
 "\n"
 "Raadpleeg die iwpriv(8) vir verdere inligting."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Gebruik outospeuring"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modus"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Tipe sertifikaat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5323,19 +5556,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6028,7 +6261,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Gebruik 'n disket"
diff --git a/po/am.po b/po/am.po
index 663cc0a..ee82c7e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-06-01 03:36+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -1980,12 +1980,7 @@ msgstr "እንኳን ደስ ያለዎ!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2361,12 +2356,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2431,7 +2421,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4290,12 +4292,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4342,7 +4349,58 @@ msgstr "ራስ-ገዝ"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "የተጠቃሚ ስም"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "ሚስጢራዊ ቃል"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4396,7 +4454,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "&ፖርት፦"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "በራስ-ገዝ ፈልጎ አግኝ"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "የአሠራሩ ዘዴ"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4882,19 +5115,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5546,7 +5779,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "ፍሎፒ ተጠቀም"
diff --git a/po/ar.po b/po/ar.po
index 74c2386..9be55dc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-03-03 01:06+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -2031,12 +2031,7 @@ msgstr "تهانينا"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2412,12 +2407,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2482,7 +2472,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4683,12 +4685,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4735,7 +4742,58 @@ msgstr "آلي"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "اسم الدخول للحساب (اسم المستخدم)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "كلمة المرور"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "اسم الشّهادة"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4817,7 +4875,182 @@ msgstr ""
 "\n"
 "راجع صفحة دليل iwpriv(8) للمزيد من المعلومات."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "البروتوكول"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "تحقق آلي"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "الوضع"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "نوع الشّهادة"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5328,19 +5561,19 @@ msgstr "الرجاء اختيار مشغّل ويندوز (ملف .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6036,7 +6269,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "استخدام قرص مرن"
diff --git a/po/az.po b/po/az.po
index 9185e10..8c69c28 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-az\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-03-31 14:21+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -2035,12 +2035,7 @@ msgstr "Təbriklər"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2416,12 +2411,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2486,7 +2476,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4360,12 +4362,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4412,7 +4419,58 @@ msgstr "Avtomatik"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Hesab Girişi (istifadəçi adı)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Şifrə"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4466,7 +4524,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Avtomatik təsbit et"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mod"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4971,19 +5204,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5669,7 +5902,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Disket işlət"
diff --git a/po/be.po b/po/be.po
index b155a93..0f8c0e8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net VERSION\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -1986,12 +1986,7 @@ msgstr "Прыміце віншаванні!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2367,12 +2362,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2437,7 +2427,19 @@ msgstr "Карыстальнік"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4299,12 +4301,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4351,7 +4358,58 @@ msgstr "Аўтаматычна"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Імя для ўваходу (імя карыстальніку)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Пароль"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Сэртыфікат"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4405,7 +4463,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Пратакол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Аўтаматычнае вызначэнне"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Рэжым"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Сэртыфікат"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4891,19 +5124,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5565,7 +5798,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Захаванне на дыскету"
diff --git a/po/bg.po b/po/bg.po
index 0a87aac..79ce740 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-bg\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:27+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -2024,12 +2024,7 @@ msgstr "Поздравления"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2405,12 +2400,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2475,7 +2465,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4339,12 +4341,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4391,7 +4398,58 @@ msgstr "Автоматично"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Име на акаунта (потебителско име)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Парола"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4445,7 +4503,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Автоматично засичане"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Режим"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4946,19 +5179,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5644,7 +5877,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Запази на дискета"
diff --git a/po/bn.po b/po/bn.po
index 28a4233..735cfad 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net HEAD\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-03-19 23:18+0600\n"
 "Last-Translator: Samia <mailsamia2001@yahoo.com>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -2043,12 +2043,7 @@ msgstr "স্বাগতম"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2426,12 +2421,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2496,7 +2486,19 @@ msgstr "ইউজারড্রেক"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4672,12 +4674,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4724,9 +4731,60 @@ msgstr "সয়ংক্রিয়"
 msgid "Encryption mode"
 msgstr ""
 
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "একাউন্ট লগইন (ইউজারনেম)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "পাসওয়ার্ড"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "সার্টফাইলের নাম"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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 ""
+
 # sam=
 # parameter has been translated as প্যারামিটার
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4798,7 +4856,183 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "প্রটোকল"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "সয়ং-সনাক্ত"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "মোড"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "সার্টিফিকেটের ধরণ"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5317,19 +5551,19 @@ msgstr "উইন্ডোজ ড্রাইভারটি বেছে নি
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6029,7 +6263,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "একটি ফ্লপি ব্যবহার করো"
diff --git a/po/br.po b/po/br.po
index 93b562a..2834531 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 10.2\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-02 23:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -1994,12 +1994,7 @@ msgstr "Brav"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "N'hell ket bet ouzhpennañ ur voullerez.."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2375,12 +2370,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "N'hell ket bet cheñchiñ ar rannad Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2445,7 +2435,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Arveriaded Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "N'hell ket bet cheñchiñ ar rannad Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4311,12 +4313,17 @@ msgstr "WEP serr"
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Dao eo implij restroù meriant gant an drobarzhell-se."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4363,7 +4370,58 @@ msgstr "Emgefreek"
 msgid "Encryption mode"
 msgstr "Mod enrinegadur"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Kont (anv an arveriad)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Tremenger"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Anv an testeni"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4417,7 +4475,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Komenad"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Dinoiñ dre ardivink"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mod"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Testeni"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4903,19 +5136,19 @@ msgstr "Dibabit ar sturier Windows (restr .inf) mar plij"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "N'hellan ket staliañ ar sturier ndiswrapper %s !"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "N'hellan ket kargañ ar mollad ndiswrapper !"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "N'hellan ket kargañ ar mollad ndiswrapper !"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Ne m'eus ket bet kavout an etrefas ndiswrapper !"
@@ -5596,7 +5829,12 @@ msgstr ""
 "Moien zo da staliañ ar restroù red digant an URL-mañ :\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Dao eo implij restroù meriant gant an drobarzhell-se."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Implijit ur bladennig"
@@ -5797,5 +6035,8 @@ msgstr "Implijit enframmadur CISCO-UDP"
 msgid "Use specific UDP port"
 msgstr "Implijit ur porzh UDP ispisial"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "N'hell ket bet ouzhpennañ ur voullerez.."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Skoazell enlinenn"
diff --git a/po/bs.po b/po/bs.po
index 1310bec..80e4c29 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-13 19:15+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -2094,12 +2094,7 @@ msgstr "Čestitamo"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Čarobnjak je uspješno dodao Samba resurs za štampač"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Nisam uspio dodati štampače."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2481,12 +2476,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Čarobnjak je uspješno dodao Samba resurs za štampač"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Nisam uspio izmijeniti Samba dijeljeni resurs."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2551,7 +2541,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba korisnici"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Nisam uspio izmijeniti Samba dijeljeni resurs."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba upravljanje Samba dijeljenim resursima"
@@ -4752,12 +4754,17 @@ msgstr "Restricted WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Potrebne su firmware datoteke za ovaj uređaj."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4806,7 +4813,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Režim šifrovanja"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Korisničko ime"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Šifra"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Naziv certifikata"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4894,7 +4952,182 @@ msgstr ""
 "\n"
 "Pogledajte man stranicu iwpriv(8) za daljnje informacije."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto prepoznavanje"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Potreban je ključ za šifrovanje."
@@ -5414,12 +5647,7 @@ msgstr "Molim izaberite Windows drajver (.inf datoteka)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Ne mogu instalirati ndiswrapper drajver %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Ne mogu učitati ndiswrapper modul!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5428,7 +5656,12 @@ msgstr ""
 "Izabrani uređaj je već podešen sa drajverom %s.\n"
 "Želite li zaista koristiti ndiswrapper drajver?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Ne mogu učitati ndiswrapper modul!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Ne mogu pronaći ndiswrapper interfejs!"
@@ -6142,7 +6375,12 @@ msgstr ""
 "Potrebne datoteke se takođe mogu instalirati sa ovog URLa:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Potrebne su firmware datoteke za ovaj uređaj."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Koristi disketu"
@@ -6342,5 +6580,8 @@ msgstr "Koristi Cisco-UDP enkapsulaciju"
 msgid "Use specific UDP port"
 msgstr "Koristi navedeni UDP port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Nisam uspio dodati štampače."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Dobijte pomoć on-line"
diff --git a/po/ca.po b/po/ca.po
index a3a19c9..996a3d3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-09-13 23:24+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -2062,12 +2062,7 @@ msgstr "Felicitats"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2444,12 +2439,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "No s'ha pogut canviar la contrasenya."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2514,7 +2504,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Usuaris Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "No s'ha pogut canviar la contrasenya."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4414,12 +4416,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4467,7 +4474,58 @@ msgstr "Automàtic"
 msgid "Encryption mode"
 msgstr "Mode de xifrat"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Entrada del compte (nom d'usuari)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Contrasenya"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nom del certificat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4521,7 +4579,183 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Detecció automàtica"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Nom del certificat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5043,19 +5277,19 @@ msgstr "Si us plau escolliu el controlador de Windows (fitxer .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "No s'ha pogut instal·lar el controlador ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "No s'ha pogut carregar el mòdul ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "No s'ha pogut carregar el mòdul ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5760,7 +5994,12 @@ msgstr ""
 "Els fitxers necessaris també poden ser instal·lats des d'aquesta URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Usa un disquet"
diff --git a/po/cs.po b/po/cs.po
index de14077..ce0ce2c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,14 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-18 00:12+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../bin/drakconnect:61 ../lib/network/netconnect.pm:118
@@ -575,7 +576,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Gratulujeme, síťové rozhraní \"%s\" bylo úspěšně odstraněno"
 
 #: ../bin/drakconnect:769
@@ -2064,7 +2066,8 @@ msgstr "Přidat sdílení speciální tiskárny"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Cílem tohoto průvodce je snadné vytvoření nového sdílení Samba se speciální "
 "tiskárnou."
@@ -2089,15 +2092,11 @@ msgstr "Gratulujeme"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Průvodce úspěšně přidal sdílení Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Přidání tiskáren selhalo."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Prosím přidejte nebo vyberte sdílení tiskárny Samba, chcete-li jej upravit."
+msgstr ""
+"Prosím přidejte nebo vyberte sdílení tiskárny Samba, chcete-li jej upravit."
 
 #: ../bin/draksambashare:579
 #, c-format
@@ -2206,7 +2205,8 @@ msgstr "Veřejné:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Maska pro vytvoření, režim vytvoření a maska adresáře by měla být "
 "celočíselná, např. 0755."
@@ -2262,8 +2262,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"Samba umožňuje vašemu serveru chovat se jako tiskový "
-"a souborový server pro pracovní stanice s jinými systémy než Linux."
+"Samba umožňuje vašemu serveru chovat se jako tiskový a souborový server pro "
+"pracovní stanice s jinými systémy než Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2276,15 +2276,15 @@ msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr ""
-"Server nastavený jako PDC je odpovědný za ověřování Windows "
-"v rámci domény."
+"Server nastavený jako PDC je odpovědný za ověřování Windows v rámci domény."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
-"Instalace jednoho serveru mohou použít ověřování hesel pomocí "
-"modulů smbpasswd nebo tdbsam"
+"Instalace jednoho serveru mohou použít ověřování hesel pomocí modulů "
+"smbpasswd nebo tdbsam"
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2325,9 +2325,9 @@ msgid ""
 "ie: os level = 34"
 msgstr ""
 "Globální volba úrovně OS určuje úroveň operačního systému, za jaký se bude "
-"Samba vydávat při volbě prohlížeče. Pokud si přejete, aby Samba volbu vyhrála "
-"a stala se hlavním prohlížečem, nastavte tuto úroveň nad aktuální úroveň "
-"ostatních operačních systémů na síti, např.: os level = 34"
+"Samba vydávat při volbě prohlížeče. Pokud si přejete, aby Samba volbu "
+"vyhrála a stala se hlavním prohlížečem, nastavte tuto úroveň nad aktuální "
+"úroveň ostatních operačních systémů na síti, např.: os level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2370,8 +2370,8 @@ msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
 msgstr ""
-"Úroveň uživatele: klient posílá požadavek na započetí sezení přímo "
-"po vyjednání protokolu. Tento požadavek poskytuje uživatelské jméno a heslo."
+"Úroveň uživatele: klient posílá požadavek na započetí sezení přímo po "
+"vyjednání protokolu. Tento požadavek poskytuje uživatelské jméno a heslo."
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2385,8 +2385,8 @@ msgid ""
 "in a central, shared, account repository. The centralized account repository "
 "is shared between domain (security) controllers."
 msgstr ""
-"Úroveň domény: poskytuje mechanismus pro ukládání všech účtů uživatelů "
-"a skupin na centrálním, sdíleném úložišti účtů. Centralizované úložiště účtů "
+"Úroveň domény: poskytuje mechanismus pro ukládání všech účtů uživatelů a "
+"skupin na centrálním, sdíleném úložišti účtů. Centralizované úložiště účtů "
 "je sdíleno mezi doménovými (bezpečnostními) řadiči."
 
 #: ../bin/draksambashare:1142
@@ -2405,8 +2405,8 @@ msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
-"Transparent je způsob, jakým bude tento server popsán pracovním stanicím "
-"s Windows."
+"Transparent je způsob, jakým bude tento server popsán pracovním stanicím s "
+"Windows."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2429,18 +2429,22 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Soubor se záznamy: použijte soubor.%m, chcete-li použít oddělený soubor "
-"se záznamy pro každý připojený počítač"
+"Soubor se záznamy: použijte soubor.%m, chcete-li použít oddělený soubor se "
+"záznamy pro každý připojený počítač"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Úroveň záznamů: nastavte úroveň (podrobnosti) záznamů (0 <= úroveň záznamů <= 10)"
+msgstr ""
+"Úroveň záznamů: nastavte úroveň (podrobnosti) záznamů (0 <= úroveň záznamů "
+"<= 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Max. délka záznamů: zadejte horní omezení velikosti souborů se záznamy (v kB)."
+msgstr ""
+"Max. délka záznamů: zadejte horní omezení velikosti souborů se záznamy (v "
+"kB)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2460,7 +2464,8 @@ msgstr "Úroveň záznamů:"
 #: ../bin/draksambashare:1177
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "Tento průvodce sestavil následující parametry pro nastavení protokolu Samba."
+msgstr ""
+"Tento průvodce sestavil následující parametry pro nastavení protokolu Samba."
 
 #: ../bin/draksambashare:1177
 #, c-format
@@ -2477,8 +2482,8 @@ msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
-"Pokud jste již nějaká sdílení vytvořili, objeví se tato sdílení v tomto nastavení. "
-"Upravte tato sdílení spuštěním 'drakwizard sambashare'."
+"Pokud jste již nějaká sdílení vytvořili, objeví se tato sdílení v tomto "
+"nastavení. Upravte tato sdílení spuštěním 'drakwizard sambashare'."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2495,12 +2500,7 @@ msgstr "Transparent serveru:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Průvodce úspěšně nastavil váš Samba server."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Nastavení serveru Samba selhalo."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Průvodce nastavením Samba neočekávaně selhal:"
@@ -2565,7 +2565,19 @@ msgstr "UserDrake"
 msgid "Samba Users"
 msgstr "Uživatelé Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Nastavení serveru Samba selhalo."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba spravuje sdílení Samba"
@@ -4141,7 +4153,8 @@ msgstr "Lokální měřítko"
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
-msgstr "Varování, bylo detekováno jiné připojení k Internetu, zřejmě je použita síť"
+msgstr ""
+"Varování, bylo detekováno jiné připojení k Internetu, zřejmě je použita síť"
 
 #: ../bin/net_monitor:472
 #, c-format
@@ -4288,7 +4301,8 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:53
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Pro zvolené zařízení nelze nalézt síťové rozhraní (pomocí ovladače %s)."
+msgstr ""
+"Pro zvolené zařízení nelze nalézt síťové rozhraní (pomocí ovladače %s)."
 
 #: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, c-format
@@ -4758,12 +4772,17 @@ msgstr "Omezený WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA s předsdíleným klíčem"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Pro toto zařízení jsou potřeba soubory s firmware."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4812,7 +4831,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Režim šifrování"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Váš účet (uživatelské jméno)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Heslo"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Název certifikátu"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4900,7 +4970,182 @@ msgstr ""
 "\n"
 "Více informací viz manuálová stránka iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Autodetekce"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Režim"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certifikát"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Je vyžadován šifrovací klíč."
@@ -5421,12 +5666,7 @@ msgstr "Vyberte prosím ovladač z Windows (soubor .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Nelze nainstalovat ovladač ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Nelze načíst modul ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5435,7 +5675,12 @@ msgstr ""
 "Vybrané zařízení je již nastaveno pro ovladač %s.\n"
 "Opravdu chcete použít ovladač ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Nelze načíst modul ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Nelze nalézt rozhraní ndiswrapper!"
@@ -6033,7 +6278,8 @@ msgstr "Nastavení proxy"
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
-msgstr "Zde můžete zadat nastavení vaší proxy (např. http://muj_proxy_server:8080)"
+msgstr ""
+"Zde můžete zadat nastavení vaší proxy (např. http://muj_proxy_server:8080)"
 
 #: ../lib/network/network.pm:431
 #, c-format
@@ -6116,7 +6362,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:135
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Některé komponenty (%s) jsou pro hardware %s nutné, ale nejsou dostupné."
+msgstr ""
+"Některé komponenty (%s) jsou pro hardware %s nutné, ale nejsou dostupné."
 
 #: ../lib/network/thirdparty.pm:136
 #, c-format
@@ -6146,7 +6393,12 @@ msgstr ""
 "Požadované soubory lze rovněž instalovat z tohoto URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Pro toto zařízení jsou potřeba soubory s firmware."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Použít disketu"
@@ -6346,3 +6598,5 @@ msgstr "Použít zapouzdření Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Použít specifický port UDP"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Přidání tiskáren selhalo."
diff --git a/po/cy.po b/po/cy.po
index b97f6ed..b29e4a5 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva drakx-net.cy\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-20 20:18-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
@@ -2096,12 +2096,7 @@ msgstr "Llongyfarchiadau"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Mae'r dewin wedi ychwanegu cyfran argraffydd Samba yn llwyddiannus."
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Methwyd ychwanegu argraffydd."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Ychwanegwch neu ddewis cyfran argraffydd Samba i allu ei newid."
@@ -2505,12 +2500,7 @@ msgstr "Baner gweinydd:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Mae'r dewin wedi ffurfweddu eich gweinydd Samba yn llwyddiannus."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Methwyd ffurfweddu eich gweinydd Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Mae dewin Samba wedi methu'n annisgwyl"
@@ -2575,7 +2565,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Defnyddwyr Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Methwyd ffurfweddu eich gweinydd Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba yn rheoli cyfrannau Samba"
@@ -4779,12 +4781,17 @@ msgstr "WEP cyfyngedig"
 msgid "WPA Pre-Shared Key"
 msgstr "Allwedd Cyn Rhannu WEP"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Mae angen ffeiliau cadarnwedd ar gyfer y ddyfais"
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4833,7 +4840,58 @@ msgstr "Awtomatig"
 msgid "Encryption mode"
 msgstr "Modd Amgryptiedig"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Mewngofnod Cyfrif (enw defnyddiwr)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Cyfrinair"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Enw'r dystysgrif"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4918,7 +4976,182 @@ msgstr ""
 "\n"
 "Gw. tudalen iwpriv(8) man am ragor o wybodaeth."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Awtoganfod"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modd"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Tystysgrif"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Mae angen allwedd amgryptio."
@@ -5439,12 +5672,7 @@ msgstr "Dewiswch y gyrrwr Windows (.inf file)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Methu arsefydlu y gyrrydd ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "methu llwytho'r modiwl ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5453,7 +5681,12 @@ msgstr ""
 "Mae'r ddyfais hon wedi ei ffurfweddu eisoes gyda gyrrwr %s.\n"
 "Ydych chi wir am ddefnyddio gyrrwr ndiswrapper ?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "methu llwytho'r modiwl ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Methu canfod rhyngwyneb ndiswrapper!"
@@ -6171,7 +6404,12 @@ msgstr ""
 "Mae modd gosod y ffeiliau hyn o URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Mae angen ffeiliau cadarnwedd ar gyfer y ddyfais"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Defnyddiwch ddisg meddal"
@@ -6371,5 +6609,8 @@ msgstr "Defnyddio mewngapsiwleiddio Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Defnyddio porth UDP penodol"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Methwyd ychwanegu argraffydd."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Cymorth Ar-lein"
diff --git a/po/da.po b/po/da.po
index 1bec234..418528a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-03-01 16:21+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -582,7 +582,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Tillykke, netværksgrænsesnittet '%s' er blevet slettet uden problemer"
 
 #: ../bin/drakconnect:769
@@ -2074,7 +2075,8 @@ msgstr "Tilføj speciel delt Samba-printerressurce"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Målet for denne hjælper er at nemt oprette en speciel delt Samba-"
 "printerressurce."
@@ -2099,15 +2101,11 @@ msgstr "Tillykke"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Hjælperen tilføjede Samba printer-delingen"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Kunne ikke tilføje printere."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Tilføj eller vælg en delt Samba-skriverressurce for at kunne ændre den."
+msgstr ""
+"Tilføj eller vælg en delt Samba-skriverressurce for at kunne ændre den."
 
 #: ../bin/draksambashare:579
 #, c-format
@@ -2216,7 +2214,8 @@ msgstr "Offentlig:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Opretelses-maske, oprettelsesrettigheder og katalogmaske bør være nummerisk. "
 "fx: 0755."
@@ -2272,8 +2271,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"Samba giver din server mulighed for at opføre sig som en fil- og print-server for "
-"arbejdsstationer der kører ikke-Linux systemer."
+"Samba giver din server mulighed for at opføre sig som en fil- og print-"
+"server for arbejdsstationer der kører ikke-Linux systemer."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2286,13 +2285,16 @@ msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr ""
-"Server opsat som en PDC er ansvarlig for Windows-autentifikation "
-"for hele domænet."
+"Server opsat som en PDC er ansvarlig for Windows-autentifikation for hele "
+"domænet."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Enkelt-server installationer kan bruge smbpasswd eller tdbsam adgangskode-motorer"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Enkelt-server installationer kan bruge smbpasswd eller tdbsam adgangskode-"
+"motorer"
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2333,10 +2335,10 @@ msgid ""
 "ie: os level = 34"
 msgstr ""
 "Den generelle OS-niveau valgmulighed bestemmer operativsystems-niveauet som "
-"Samba vil maskeradere på ved udvælgelse af browser. Hvis du ønsker at Samba skal"
-"vinde en udvælgelse og blive hoved-browser, kan du sætte niveauet over "
-"operativsystemets på dit netværk med den højeste aktuelle værdi. "
-"dvs.: os level = 34"
+"Samba vil maskeradere på ved udvælgelse af browser. Hvis du ønsker at Samba "
+"skalvinde en udvælgelse og blive hoved-browser, kan du sætte niveauet over "
+"operativsystemets på dit netværk med den højeste aktuelle værdi. dvs.: os "
+"level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2351,7 +2353,9 @@ msgstr "Arbejdsgruppe"
 #: ../bin/draksambashare:1112
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba har brug for at vide hvilken Windows arbejdsgruppe som den skal betjene."
+msgstr ""
+"Samba har brug for at vide hvilken Windows arbejdsgruppe som den skal "
+"betjene."
 
 #: ../bin/draksambashare:1119 ../bin/draksambashare:1183
 #, c-format
@@ -2493,12 +2497,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Hjælpeprogrammet konfigurerede din Samba-server uden problemer."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Kunne ikke konfigurere Samba-server."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba hjælpeprogrammet mislykkesed uventet:"
@@ -2563,7 +2562,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba-brugere"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Kunne ikke konfigurere Samba-server."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba håndterer delte Samba-ressurser"
@@ -4285,7 +4296,8 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:53
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Kunne ikke finde netværksgrænseflade for den valgte enhed (bruger %s-driver)"
+msgstr ""
+"Kunne ikke finde netværksgrænseflade for den valgte enhed (bruger %s-driver)"
 
 #: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, c-format
@@ -4330,7 +4342,8 @@ msgstr "domæne der søges i"
 #: ../lib/network/connection/ethernet.pm:141
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Som standard vil søge-domænet blive sat ud fra det fuldt angivne værtsnavn"
+msgstr ""
+"Som standard vil søge-domænet blive sat ud fra det fuldt angivne værtsnavn"
 
 #: ../lib/network/connection/ethernet.pm:149
 #, c-format
@@ -4754,12 +4767,17 @@ msgstr "Begrænset WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Forud-delt nøgle"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Maskinprogrammel kræves for denne enhed."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4808,7 +4826,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Krypteringstilstand"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Konto-login (brugernavn)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Adgangskode"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Navn på certifikatet"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4898,7 +4967,182 @@ msgstr ""
 "\n"
 "Se iwpriv(8) man-side for yderligere information."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatisk detektion"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Tilstand"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "En krypteringsnøgle kræves"
@@ -5280,7 +5524,8 @@ msgstr "Kunne ikke initiere %s-opkoblingstype!"
 #: ../lib/network/drakvpn.pm:60
 #, c-format
 msgid "Please select an existing VPN connection or enter a new name."
-msgstr "Venligst vælg en eksisterende VPN-opkobling eller indtast et nyt navn. "
+msgstr ""
+"Venligst vælg en eksisterende VPN-opkobling eller indtast et nyt navn. "
 
 #: ../lib/network/drakvpn.pm:64
 #, c-format
@@ -5378,7 +5623,8 @@ msgstr "Et angreb på %s er blevet forsøgt af %s"
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
-msgstr "Programmet '%s' prøver at bruge en tjeneste (%s) tilgængelig for netværket."
+msgstr ""
+"Programmet '%s' prøver at bruge en tjeneste (%s) tilgængelig for netværket."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:150
@@ -5419,12 +5665,7 @@ msgstr "Vælg Windows-driveren (.inf-fil)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Kan ikke installere %s ndiswrapper-driveren!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Kan ikke indlæse ndiswrapper-modulet!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5433,7 +5674,12 @@ msgstr ""
 "Den valgte enhed er allerede blevet konfigureret med %s-driveren.\n"
 "Ønsker du virkelig at bruge en ndiswrapper-driver?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Kan ikke indlæse ndiswrapper-modulet!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Kan ikke finde ndiswrapper-grænsefladen!"
@@ -6118,7 +6364,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:135
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Nogen komponenter ('%s') behøves, men er ikke tilgængelige for %s-udstyret."
+msgstr ""
+"Nogen komponenter ('%s') behøves, men er ikke tilgængelige for %s-udstyret."
 
 #: ../lib/network/thirdparty.pm:136
 #, c-format
@@ -6148,7 +6395,12 @@ msgstr ""
 "Filerne som behøves kan også installeres fra denne internetadresse:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Maskinprogrammel kræves for denne enhed."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Brug en diskette"
@@ -6348,3 +6600,5 @@ msgstr "Brug Cisco-UDP indkapsling"
 msgid "Use specific UDP port"
 msgstr "Brug specifik UDP-port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Kunne ikke tilføje printere."
diff --git a/po/de.po b/po/de.po
index 306fe0a..564915b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-02 19:21+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -591,7 +591,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Gratulation, die „%s“ Netzwerk Karte wurde erfolgreich gelöscht"
 
 #: ../bin/drakconnect:769
@@ -1282,7 +1283,8 @@ msgstr ""
 #: ../bin/drakinvictus:102
 #, c-format
 msgid "Network redundancy (leave empty if interface is not used)"
-msgstr "Netzwerkredundanz (wenn das Interface nicht verwendet wird, leer lassen)"
+msgstr ""
+"Netzwerkredundanz (wenn das Interface nicht verwendet wird, leer lassen)"
 
 #: ../bin/drakinvictus:105
 #, c-format
@@ -1750,7 +1752,8 @@ msgstr "Bitte geben Sie ein Verzeichnis zur Freigabe an."
 #: ../bin/draknfs:516
 #, c-format
 msgid "Please use the modify button to set right access."
-msgstr "Bitte verwenden Sie den Ändern-Knopf, um den richtigen Zugriff einzustellen."
+msgstr ""
+"Bitte verwenden Sie den Ändern-Knopf, um den richtigen Zugriff einzustellen."
 
 #: ../bin/draknfs:531
 #, c-format
@@ -2097,7 +2100,8 @@ msgstr "Füge spezielle Druckerfreigabe hinzu"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Ziel dieses Assistenten ist es, eine neue spezielle Samba-Druckerfreigabe "
 "einfach zu erzeugen."
@@ -2122,12 +2126,7 @@ msgstr "Herzlichen Glückwunsch"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Der Assistent hat die Samba-Druckfreigabe erfolgreich hinzugefügt"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Konnte Drucker nicht hinzufügen."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2243,7 +2242,8 @@ msgstr "Öffentlich :"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Erzeugungsmaske, Erzeugungsmodus und Verzeichnismaske müssen numerisch sein "
 "(z.B. 0755)."
@@ -2508,12 +2508,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Der Assistent hat die Samba-Druckfreigabe erfolgreich hinzugefügt"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Konnte Samba-Freigabe nicht ändern."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2578,7 +2573,19 @@ msgstr "UserDrake"
 msgid "Samba Users"
 msgstr "Samba-Benutzer"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Konnte Samba-Freigabe nicht ändern."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba verwaltet Samba-Freigaben"
@@ -4399,7 +4406,8 @@ msgstr "Link auf Interface %s erkannt"
 #: ../lib/network/connection/ethernet.pm:276
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
-msgstr "Fordere eine Netzwerkadresse auf dem Interface %s ( %s Protokoll) an ..."
+msgstr ""
+"Fordere eine Netzwerkadresse auf dem Interface %s ( %s Protokoll) an ..."
 
 #: ../lib/network/connection/ethernet.pm:277
 #, c-format
@@ -4793,12 +4801,17 @@ msgstr "Eingeschränktes WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA mit verteilten Schlüsseln"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
+#, c-format
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Für dieses Gerät wird eine Firmware benötig."
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4847,7 +4860,58 @@ msgstr "Automatisch"
 msgid "Encryption mode"
 msgstr "Verschlüsselungsmodus"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Benutzername (Login)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Passwort"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Name des Zertifikats"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4931,7 +4995,182 @@ msgstr ""
 "\n"
 "Die Manpages zu iwpriv(8) geben weitere Informationen."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Autoerkennung"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modus"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Zertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Ein verschlüsselter Schlüssel ist notwendig"
@@ -5459,12 +5698,7 @@ msgstr "Bitte wählen Sie den Windowstreiber (.inf Datei)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Konnte den %s ndiswrapper-Treiber nicht installieren!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Konnte das ndiswrapper-Modul nicht laden!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5473,7 +5707,12 @@ msgstr ""
 "Das ausgewählte Gerät wurde bereits mit dem %s-Treiber konfiguriert.\n"
 "Möchten Sie wirklich einen ndiswrapper-Treiber verwenden?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Konnte das ndiswrapper-Modul nicht laden!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Konnte die ndiswrapper-Schnittstelle nicht finden!"
@@ -6052,7 +6291,8 @@ msgstr "Zuguterletzt kann die DNS Server IP Adresse eingegeben werden."
 #: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "Die IP-Adresse des DNS-Servers sollte etwa die Form „192.168.1.42“ haben!"
+msgstr ""
+"Die IP-Adresse des DNS-Servers sollte etwa die Form „192.168.1.42“ haben!"
 
 #: ../lib/network/netconnect.pm:807
 #, c-format
@@ -6196,7 +6436,12 @@ msgstr ""
 "Die benötigten Dateien können auch von dieser URL installiert werden:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Für dieses Gerät wird eine Firmware benötig."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Benutze eine Diskette"
@@ -6396,3 +6641,5 @@ msgstr "verwende Cisco-UDP encapsulation"
 msgid "Use specific UDP port"
 msgstr "Verwende speziellen UDP Port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Konnte Drucker nicht hinzufügen."
diff --git a/po/drakx-net.pot b/po/drakx-net.pot
index 2c67f88..01150ac 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: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+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"
@@ -1846,12 +1846,7 @@ msgstr ""
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2201,12 +2196,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2271,7 +2261,19 @@ msgstr ""
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4036,12 +4038,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
 msgstr ""
@@ -4086,7 +4093,58 @@ msgstr ""
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, c-format
+msgid "EAP Login/Username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, c-format
+msgid "EAP Password"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -4133,7 +4191,181 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, c-format
+msgid "EAP Protocol"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447 ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "Auto Detect"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, c-format
+msgid "EAP Mode"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MSCHAPV2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4596,19 +4828,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5245,7 +5477,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 1ca1561..5d8020a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-el\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:28+0200\n"
 "Last-Translator:  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -2032,12 +2032,7 @@ msgstr "Συγχαρητήρια"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2413,12 +2408,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2483,7 +2473,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4351,12 +4353,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4403,7 +4410,58 @@ msgstr "Αυτόματο"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Λογαριασμός Σύνδεσης (όνομα χρήστη)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Κωδικός Πρόσβασης"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4457,7 +4515,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Πρωτόκολλο"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Αυτόματη ανίχνευση"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Λειτουργία"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4959,19 +5192,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5660,7 +5893,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Αποθήκευση σε δισκέτα"
diff --git a/po/eo.po b/po/eo.po
index 7502d66..13963b6 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2003-03-12 18:31-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -2005,12 +2005,7 @@ msgstr "Gratulojn"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2386,12 +2381,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2456,7 +2446,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4318,12 +4320,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4370,7 +4377,58 @@ msgstr "Aŭtomate"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Konta Salutnomo (uzula nomo)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Pasvorto"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4424,7 +4482,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokolo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Memdetekta"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP (Pasvorta Aŭtentikigada Protokolo)"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Reĝimo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP (Pasvorta Aŭtentikigada Protokolo)"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "per CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4910,19 +5143,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5597,7 +5830,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Konservu sur disketo"
diff --git a/po/es.po b/po/es.po
index 197b4c5..e388445 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-10-02 22:48-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -2117,12 +2117,7 @@ msgstr "Felicidades"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "El asistente añadió exitosamente la impresora compartida Samba."
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Fallo al agregar impresoras."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2504,12 +2499,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "El asistente añadió exitosamente la impresora compartida Samba."
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Fallo al modificar el recurso compartido Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2574,7 +2564,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Usuarios Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Fallo al modificar el recurso compartido Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba administra los recursos compartidos Samba"
@@ -4787,12 +4789,17 @@ msgstr "WEP restringido"
 msgid "WPA Pre-Shared Key"
 msgstr "Clave Pre-compartida de WPA"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Se necesitan archivos de firmware para este dispositivo."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4841,7 +4848,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Modo de cifrado"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Usuario de la cuenta (nombre de usuario)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Contraseña"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nombre del certificado"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4930,7 +4988,182 @@ msgstr ""
 "\n"
 "Vea la página man iwpriv(8) para más información."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocolo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Detección automática"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificado"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Se necesita una clave de cifrado."
@@ -5457,12 +5690,7 @@ msgstr "Por favor, elija el controlador de Windows® (archivo .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "¡No se ha podido instalar el controlador de ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "¡No se ha podido cargar el módulo de ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5471,7 +5699,12 @@ msgstr ""
 "La unidad seleccionada ya ha sido configurada con el controlador %s.\n"
 "¿Está seguro de que desea utilizar un controlador de ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "¡No se ha podido cargar el módulo de ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "¡No se ha encontrado la interfaz de ndiswrapper!"
@@ -6191,7 +6424,12 @@ msgstr ""
 "Los archivos necesarios también se pueden instalar desde esta URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Se necesitan archivos de firmware para este dispositivo."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar un disquete"
@@ -6391,3 +6629,6 @@ msgstr "Usar encaspulado Cisco UDP"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Usar puerto UDP específico"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Fallo al agregar impresoras."
diff --git a/po/et.po b/po/et.po
index ce56103..5f4c328 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-et\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-22 22:49+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -2086,12 +2086,7 @@ msgstr "Õnnitleme!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Nõustaja lisas edukalt Samba printeriressursi"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Printerite lisamine ebaõnnestus."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Palun lisage või valige Samba printeriressurss, et seda muuta."
@@ -2259,8 +2254,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"Samba võimaldab Teie serveril toimida faili- ja trükkimisserverina "
-"ka tööjaamadele, kus ei tööta Linux."
+"Samba võimaldab Teie serveril toimida faili- ja trükkimisserverina ka "
+"tööjaamadele, kus ei tööta Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2280,8 +2275,8 @@ msgstr ""
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
-"Ühe serveri paigalduse korral võib kasutada paroolirakenduse taustaprogrammina "
-"programmi smbpasswd või tdbsam"
+"Ühe serveri paigalduse korral võib kasutada paroolirakenduse "
+"taustaprogrammina programmi smbpasswd või tdbsam"
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2289,8 +2284,8 @@ msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
-"Domeeni master = jah sunnib serveri registreerima NetBIOS-e nime <pdc "
-"nimi>. Seda nime tunnustavad seejärel teised serverid."
+"Domeeni master = jah sunnib serveri registreerima NetBIOS-e nime <pdc nimi>. "
+"Seda nime tunnustavad seejärel teised serverid."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2322,10 +2317,10 @@ msgid ""
 "ie: os level = 34"
 msgstr ""
 "Globaalne OS-i tase määrab operatsioonisüsteemi taseme, mille puhul Samba "
-"kasutab brauseri valimisel maskimist. Kui soovite, et Samba tuleks valimistelt "
-"välja võitjana ja saaks peabrauseriks, tuleb valida tase, mis on kõrgem kui "
-"Teie võrgu kõrgeima väärtusega operatsioonisüsteemil. "
-"Näide: OS-i tase = 34"
+"kasutab brauseri valimisel maskimist. Kui soovite, et Samba tuleks "
+"valimistelt välja võitjana ja saaks peabrauseriks, tuleb valida tase, mis on "
+"kõrgem kui Teie võrgu kõrgeima väärtusega operatsioonisüsteemil. Näide: OS-i "
+"tase = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2367,8 +2362,9 @@ msgstr "Turvarežiim"
 msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
-msgstr "Kasutaja tase: klient saadab seansi häälestamise soovi otse "
-"pärast protokolli läbirääkimisi. Soov sisaldab kasutajanime ja parooli."
+msgstr ""
+"Kasutaja tase: klient saadab seansi häälestamise soovi otse pärast "
+"protokolli läbirääkimisi. Soov sisaldab kasutajanime ja parooli."
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2401,8 +2397,7 @@ msgstr "Serveri nimi"
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr ""
-"See on nimi, millega server annab end teada Windowsi tööjaamadele."
+msgstr "See on nimi, millega server annab end teada Windowsi tööjaamadele."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2490,12 +2485,7 @@ msgstr "Serveri nimi:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Nõustaja seadistas edukalt Samba serveri."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Samba serveri seadistamine ebaõnnestus."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba nõustajat tabas ootamatu viga:"
@@ -2560,7 +2550,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba kasutajad"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Samba serveri seadistamine ebaõnnestus."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba - Samba ressursside haldamine"
@@ -4757,12 +4759,17 @@ msgstr "Piiratud WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA eeljagatud võti"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "See seade vajab püsivarafaile."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4811,7 +4818,58 @@ msgstr "Automaatne"
 msgid "Encryption mode"
 msgstr "Krüptorežiim"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Kasutajatunnus"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parool"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Sertifikaadi nimi"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4892,7 +4950,182 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automaattuvastus"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Režiim"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Sertifikaat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Vajalik on krüptovõti."
@@ -5412,12 +5645,7 @@ msgstr "Palun valige Windowsi draiver (.inf-fail)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "%s ndiswrapper-draiveri paigaldamine ebaõnnestus!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Ndiswrapper-mooduli laadimine ebaõnnestus!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5426,7 +5654,12 @@ msgstr ""
 "Valitud seade on on juba seadistatud kasutama %s draiverit.\n"
 "Kas soovite tõesti kasutada ndiswrapper-draiverit?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Ndiswrapper-mooduli laadimine ebaõnnestus!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Ndiswrapper-liidest ei leitud!"
@@ -6141,7 +6374,12 @@ msgstr ""
 "Vajalikud failid saab paigaldada ka järgmiselt URL-ilt:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "See seade vajab püsivarafaile."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Disketi kasutamine"
@@ -6340,3 +6578,6 @@ msgstr "Cisco-UDP kapselduse kasutamine"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Kindla UDP-pordi kasutamine"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Printerite lisamine ebaõnnestus."
diff --git a/po/eu.po b/po/eu.po
index dac2b1b..874baa4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-24 21:35+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -575,7 +575,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "\"%s\" sare-interfazea behar bezala ezabatu da"
 
 #: ../bin/drakconnect:769
@@ -950,8 +951,9 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 "Guztia konfiguratu da.\n"
-"Orain Internet konexioa zure bertako sareko beste konputagailu batzurekin "
-" partekatu dezakezu, sare konfiguraketa automatikoa (DHCP) eta\n Proxy katxe zerbitzari gardena (SQUID) erabiliz erabiliz."
+"Orain Internet konexioa zure bertako sareko beste konputagailu batzurekin  "
+"partekatu dezakezu, sare konfiguraketa automatikoa (DHCP) eta\n"
+" Proxy katxe zerbitzari gardena (SQUID) erabiliz erabiliz."
 
 #: ../bin/drakgw:359
 #, c-format
@@ -1251,7 +1253,9 @@ msgstr "Pasahitz bat behar da."
 msgid ""
 "This tool allows to set up network interfaces failover and firewall "
 "replication."
-msgstr "Tresna honek sareko interfazeen akatsak gainditzea eta suhesi erreplikazioa ezarri ditzake."
+msgstr ""
+"Tresna honek sareko interfazeen akatsak gainditzea eta suhesi erreplikazioa "
+"ezarri ditzake."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -1525,23 +1529,24 @@ msgstr ""
 "<span weight=\"bold\">Erabiltzailearen ID aukerak</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapeatu root erabiltzailea anonimo bezala:</span> mapeatu"
-"uid/gid 0 duten eskaerak uid/gid (root_squash) anonimora.\n"
+"<span foreground=\"royalblue3\">mapeatu root erabiltzailea anonimo bezala:</"
+"span> mapeatuuid/gid 0 duten eskaerak uid/gid (root_squash) anonimora.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">onartu urruneko root sarbide "
-"erreala:</span> itzaldu "
-"root squashing. Aukera hau gehien bat diskoak ez dituzten bezeroentzako erabilgarria da (no_root_squash).\n"
+"<span foreground=\"royalblue3\">onartu urruneko root sarbide erreala:</span> "
+"itzaldu root squashing. Aukera hau gehien bat diskoak ez dituzten "
+"bezeroentzako erabilgarria da (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapeatu erabiltzaile guztiak"
-"erabiltzaile anonimora:</span> mapeatu"
-"uid eta gid guztiak erabiltzaile anonimora (all_squash). Erabilgarria "
-"NFS bitartez esportatutako FTP direktorio publikoentzako, berrien spool "
-"direktorioak, etabar. Kontrako aukera UID ez mapeatzea da (no_all_squash), aukera lehenetsia.\n"
+"<span foreground=\"royalblue3\">mapeatu erabiltzaile guztiakerabiltzaile "
+"anonimora:</span> mapeatuuid eta gid guztiak erabiltzaile anonimora "
+"(all_squash). Erabilgarria NFS bitartez esportatutako FTP direktorio "
+"publikoentzako, berrien spool direktorioak, etabar. Kontrako aukera UID ez "
+"mapeatzea da (no_all_squash), aukera lehenetsia.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid eta anongid:</span> kontu anonimoen uid eta gid esplizituki ezarri.\n"
+"<span foreground=\"royalblue3\">anonuid eta anongid:</span> kontu anonimoen "
+"uid eta gid esplizituki ezarri.\n"
 
 #: ../bin/draknfs:171
 #, c-format
@@ -1586,7 +1591,11 @@ msgid ""
 "read and write requests on this NFS volume. The default is to disallow any "
 "request which changes the filesystem. This can also be made explicit by "
 "using this option."
-msgstr "<span foreground=\"royalblue3\">%s</span> irakurri soilik edo irakurri eta idazteko eskaerak onartu NFS bolumen honetan. Lehenetsia fitxategi sistema aldatzen duen eskaera oro ukatzea da. Hau esplizituki ere egin daiteke aukera hau erabiliz."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> irakurri soilik edo irakurri eta "
+"idazteko eskaerak onartu NFS bolumen honetan. Lehenetsia fitxategi sistema "
+"aldatzen duen eskaera oro ukatzea da. Hau esplizituki ere egin daiteke "
+"aukera hau erabiliz."
 
 #: ../bin/draknfs:179
 #, c-format
@@ -1594,7 +1603,10 @@ msgid ""
 "<span foreground=\"royalblue3\">%s</span> disallows the NFS server to "
 "violate the NFS protocol and to reply to requests before any changes made by "
 "these requests have been committed to stable storage (e.g. disc drive)."
-msgstr "<span foreground=\"royalblue3\">%s</span> NFS zerbitzariak NFS protokoloa bortxatu eta eskaerek eragindako aldaketak biltegi egonkor batean (adib. disko unitate bat) burutu aurretik eskaera hauei erantzutea ekiditen du."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> NFS zerbitzariak NFS protokoloa "
+"bortxatu eta eskaerek eragindako aldaketak biltegi egonkor batean (adib. "
+"disko unitate bat) burutu aurretik eskaera hauei erantzutea ekiditen du."
 
 #: ../bin/draknfs:180
 #, c-format
@@ -1602,7 +1614,10 @@ msgid ""
 "<span foreground=\"royalblue3\">%s</span> enable subtree checking which can "
 "help improve security in some cases, but can decrease reliability. See "
 "exports(5) man page for more details."
-msgstr "<span foreground=\"royalblue3\">%s</span> azpizuhaitzaren egiaztapena gaitu, segurtasuna hobetzen lagundu dezake zenbait kasutan, baino fidagarritasuna murriztu dezake. Begiratu exports(5) man man orria xehetasun bila."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> azpizuhaitzaren egiaztapena gaitu, "
+"segurtasuna hobetzen lagundu dezake zenbait kasutan, baino fidagarritasuna "
+"murriztu dezake. Begiratu exports(5) man man orria xehetasun bila."
 
 #: ../bin/draknfs:185 ../bin/draksambashare:632 ../bin/draksambashare:799
 #, c-format
@@ -1744,7 +1759,8 @@ msgstr "NFS partekatze bat ezabatzeak huts egin du."
 #: ../bin/drakproxy:36
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Saioa amaitu eta berriro hasi behar duzu aldaketek eragina izan dezaten"
+msgstr ""
+"Saioa amaitu eta berriro hasi behar duzu aldaketek eragina izan dezaten"
 
 #: ../bin/draksambashare:64
 #, c-format
@@ -2055,7 +2071,8 @@ msgstr "Erantsi Inprimagailu Berezia partekatzea"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Morroi honen helburua Samba inprimagailu berezi partekatze bat era errazean "
 "sortzea da."
@@ -2080,12 +2097,7 @@ msgstr "Zorionak"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Morroiak inprimagailuaren Samba elkarbanaketa erantsi du"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Inprimagailuak eransteak huts egin du."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2165,7 +2177,8 @@ msgstr "DrakSamba sarrera"
 #: ../bin/draksambashare:705
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Mesedez erantsi edo aukeratu Samba partekatze bat hura aldatu ahal izateko."
+msgstr ""
+"Mesedez erantsi edo aukeratu Samba partekatze bat hura aldatu ahal izateko."
 
 #: ../bin/draksambashare:728
 #, c-format
@@ -2199,7 +2212,8 @@ msgstr "Publikoa:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Sortu maskara, sortu modua eta direktorio maskara zenbakizkoak izan behar "
 "dira. adib: 0755."
@@ -2254,7 +2268,9 @@ msgstr "Samba zerbitzariaren konfiguraketa morroia"
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
-msgstr "Sambak zure zerbitzariak Linux ez diren sistementzako fitxategi eta inprimagailu zerbitzari bezela lan egin dezan ahalbidetzen du."
+msgstr ""
+"Sambak zure zerbitzariak Linux ez diren sistementzako fitxategi eta "
+"inprimagailu zerbitzari bezela lan egin dezan ahalbidetzen du."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2266,12 +2282,17 @@ msgstr "PDC zerbitzaria: domeinu kontrolatzaile nagusia"
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
-msgstr "PDC bezela konfiguratutako zerbitzaria domeinuan zehar Windows autentikazioaren arduraduna da."
+msgstr ""
+"PDC bezela konfiguratutako zerbitzaria domeinuan zehar Windows "
+"autentikazioaren arduraduna da."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Zerbitzari bakarreko instalazioek smbpasswd edo tdbsam pasahitz sistemak erabili ditzakete"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Zerbitzari bakarreko instalazioek smbpasswd edo tdbsam pasahitz sistemak "
+"erabili ditzakete"
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2279,8 +2300,8 @@ msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
-"Domain master = yes, zerbitzariak NetBIOS izena erregistratu dezan eragiten du <pdc "
-"name>. Beste zerbitzariek izen hau ezagutuko dute."
+"Domain master = yes, zerbitzariak NetBIOS izena erregistratu dezan eragiten "
+"du <pdc name>. Beste zerbitzariek izen hau ezagutuko dute."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2311,8 +2332,11 @@ msgid ""
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
 msgstr ""
-"«Os level» aukera globalak Sambak zerbitzarien hautaketa batean erakutsiko duen sistema eragile maila zehazten du. Sambak hautaketa irabazi eta zerbitzari nagusi bihur dadin nahi baduzu, bere maila zure sarean balio altuena duen sistema eragilearen balioaren gainetik ezarri dezakezu."
-"Adib: os level = 34"
+"«Os level» aukera globalak Sambak zerbitzarien hautaketa batean erakutsiko "
+"duen sistema eragile maila zehazten du. Sambak hautaketa irabazi eta "
+"zerbitzari nagusi bihur dadin nahi baduzu, bere maila zure sarean balio "
+"altuena duen sistema eragilearen balioaren gainetik ezarri dezakezu.Adib: os "
+"level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2354,12 +2378,16 @@ msgstr "Segurtasun modua"
 msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
-msgstr "Erabiltzaile maila: erabiltzaileak saio ezarpen eskaera bat zuzenean bidaltzen du protokolo negoziazioa jarraituz. Eskaera honek erabiltzaile izen eta pasahitz bat hornitzen ditu."
+msgstr ""
+"Erabiltzaile maila: erabiltzaileak saio ezarpen eskaera bat zuzenean "
+"bidaltzen du protokolo negoziazioa jarraituz. Eskaera honek erabiltzaile "
+"izen eta pasahitz bat hornitzen ditu."
 
 #: ../bin/draksambashare:1131
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Partekatze maila: bezeroa partekatutako baliabide bakoitzera egiaztatzen da"
+msgstr ""
+"Partekatze maila: bezeroa partekatutako baliabide bakoitzera egiaztatzen da"
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2367,7 +2395,11 @@ msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
 "in a central, shared, account repository. The centralized account repository "
 "is shared between domain (security) controllers."
-msgstr "Domeinu maila: Erabiltzaile eta talde guztien kontuak, kontu gordetegi zentralizatu, partekatu batean gordetzeko mekanismoak hornitzen ditu. Kontu gordetegi zentralizatua domeinu (segurtasun) kontrolatzaileen artean partekatzen da."
+msgstr ""
+"Domeinu maila: Erabiltzaile eta talde guztien kontuak, kontu gordetegi "
+"zentralizatu, partekatu batean gordetzeko mekanismoak hornitzen ditu. Kontu "
+"gordetegi zentralizatua domeinu (segurtasun) kontrolatzaileen artean "
+"partekatzen da."
 
 #: ../bin/draksambashare:1142
 #, c-format
@@ -2384,7 +2416,9 @@ msgstr "Zerbitzariaren iragarkia."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Iragarkia da Windows lanpostuek zerbitzari hau deskribatzeko erabiliko dutena."
+msgstr ""
+"Iragarkia da Windows lanpostuek zerbitzari hau deskribatzeko erabiliko "
+"dutena."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2406,17 +2440,23 @@ msgstr "Samba log"
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr "Egunkari fitxategia: erabili 'fitxategi.%m' konektatzen den makina bakoitzarentzako egunkari fitxategi propioa erabiltzeko"
+msgstr ""
+"Egunkari fitxategia: erabili 'fitxategi.%m' konektatzen den makina "
+"bakoitzarentzako egunkari fitxategi propioa erabiltzeko"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Egunkari maila: ezarri egunkariaren (hitz-jario) maila (0 <= egunkari maila <= 10)"
+msgstr ""
+"Egunkari maila: ezarri egunkariaren (hitz-jario) maila (0 <= egunkari maila "
+"<= 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Egunkariaren gehienezko neurria: egunkari fitxategien neurria mugatu (Kb-tan)."
+msgstr ""
+"Egunkariaren gehienezko neurria: egunkari fitxategien neurria mugatu (Kb-"
+"tan)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2443,14 +2483,18 @@ msgstr "Morroia Samba konfiguratzeko ondorengo parametroak bildu ditu."
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
-msgstr "Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu 'Hurrengoa' botoia edo erabili 'Atzera' botoia haiek zuzentzeko."
+msgstr ""
+"Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu 'Hurrengoa' "
+"botoia edo erabili 'Atzera' botoia haiek zuzentzeko."
 
 #: ../bin/draksambashare:1177
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Aurrez baliabideak partekatu badituzu, konfiguraketa honetan agertuko dira. Exekutatu 'drakwizard sambashare' zure partekatzeak kudeatzeko."
+msgstr ""
+"Aurrez baliabideak partekatu badituzu, konfiguraketa honetan agertuko dira. "
+"Exekutatu 'drakwizard sambashare' zure partekatzeak kudeatzeko."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2467,12 +2511,7 @@ msgstr "Zerbitzari iragarkia:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Morroiak egokiro konfiguratu du zure Samba zerbitzaria."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Samba zerbitzaria konfiguraketak huts egin du."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba morroiak ezustean huts egin du:"
@@ -2537,7 +2576,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba Erabiltzaileak"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Samba zerbitzaria konfiguraketak huts egin du."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSambarekin kudeatu Samba partekatzeak"
@@ -2993,7 +3044,8 @@ msgstr ""
 "\tAdibidez: path include '/etc/racoon'\n"
 "\n"
 "path pre_shared_key fitxategia: zenbait ID-entzako aurrez-partekatutako\n"
-"gakoak dituen fitxategia zehazten du. Begiratu Aurrez-partekatutako gako fitxategia.\n"
+"gakoak dituen fitxategia zehazten du. Begiratu Aurrez-partekatutako gako "
+"fitxategia.\n"
 "\tAdibidez: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
 "path certificate bidea: racoon(8) direktorio honetan bilatuko du\n"
@@ -3006,8 +3058,7 @@ msgstr ""
 "\n"
 "Pre-shared key File: Aurrez-partekatutako gakoak pare bat\n"
 "definitzen du identifikatzaile eta partekatutako gako sekretua,\n"
-"aurrez-partekatutako gako egiaztapen metodoaren lehen fasean "
-"erabiltzen dena."
+"aurrez-partekatutako gako egiaztapen metodoaren lehen fasean erabiltzen dena."
 
 #: ../bin/drakvpn-old:467 ../bin/drakvpn-old:560
 #, c-format
@@ -3416,7 +3467,8 @@ msgstr ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"Beraz, hemen, bizitza-iraupen unitateak 'min', 'min', 'sec', 'sec', 'sec' eta 'hour' dira.\n"
+"Beraz, hemen, bizitza-iraupen unitateak 'min', 'min', 'sec', 'sec', 'sec' "
+"eta 'hour' dira.\n"
 
 #: ../bin/drakvpn-old:728 ../bin/drakvpn-old:813
 #, c-format
@@ -3460,7 +3512,8 @@ msgstr ""
 "remote (helbidea | anonymous) [[ataka]] { adierazpenak }\n"
 "IKE lehen faserako parametroak zehazten ditu urruneko nodo bakoitzerako.\n"
 "Ataka lehenetsia 500 da. 'anonymous' zehazten bada, adierazpenak\n"
-"beste urruneko zuzentarau batekin bat egiten ez duen pareko orori\n egokitzen zaio.\n"
+"beste urruneko zuzentarau batekin bat egiten ez duen pareko orori\n"
+" egokitzen zaio.\n"
 "\n"
 "Adibideak: \n"
 "\n"
@@ -3632,9 +3685,9 @@ msgid ""
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
-"urruneko ostalariari bidalitako identifikatzailea eta lehenengo faseko negoziaketan erabili beharreko mota zehazten du.   address, FQDN,"
-"user_fqdn, keyid eta asn1dn idtype bezala erabili daitezke. "
-"Horrela erabiltzen dira:\n"
+"urruneko ostalariari bidalitako identifikatzailea eta lehenengo faseko "
+"negoziaketan erabili beharreko mota zehazten du.   address, FQDN,user_fqdn, "
+"keyid eta asn1dn idtype bezala erabili daitezke. Horrela erabiltzen dira:\n"
 "\tmy_identifier address [address];\n"
 "\t\tmota IP helbidea da.  Hau da mota lehenetsia ez\n"
 "\t\tbaduzu erabili beharreko identifikatzailea zehazten.\n"
@@ -4265,7 +4318,9 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:53
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Ezin da aukeratutako gailuarentzako sare interfazea aurkitu (%s gidaria erabiltzen)."
+msgstr ""
+"Ezin da aukeratutako gailuarentzako sare interfazea aurkitu (%s gidaria "
+"erabiltzen)."
 
 #: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, c-format
@@ -4737,17 +4792,24 @@ msgstr "WEP mugatua"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Aurrez-Banatutako Gakoa"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Firmware fitxategiak behar dira gailu honekin."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
-msgstr "Zure sareko irrati txartela ezgaituta dago, mesedez gaitu irrati etengailua lehenengo."
+msgstr ""
+"Zure sareko irrati txartela ezgaituta dago, mesedez gaitu irrati etengailua "
+"lehenengo."
 
 #: ../lib/network/connection/wireless.pm:322
 #, c-format
@@ -4789,7 +4851,58 @@ msgstr "Automatikoa"
 msgid "Encryption mode"
 msgstr "Zifraketa modua"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Kontuaren identifikatzailea (erabiltzaile-izena)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Pasahitza"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Ziurtagiriaren izena"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4877,7 +4990,182 @@ msgstr ""
 "\n"
 "Informazio gehiago lortzeko, ikus iwpriv(8) eskuliburuko orrialdea."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoloa"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Autodetektatu"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modua"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Ziurtagiria"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Zifraketa gako bat behar da."
@@ -4943,7 +5231,9 @@ msgstr ""
 msgid ""
 "Modems using Conexant AccessRunner chipsets cannot be supported due to "
 "binary firmware distribution problem."
-msgstr "Conexant AccessRunner chipset-ak erabiltzen dituzten modemei ezin zaie euskarririk eman firmware bitarraren banaketa arazoengatik."
+msgstr ""
+"Conexant AccessRunner chipset-ak erabiltzen dituzten modemei ezin zaie "
+"euskarririk eman firmware bitarraren banaketa arazoengatik."
 
 #: ../lib/network/connection/xdsl.pm:184
 #, c-format
@@ -5126,7 +5416,8 @@ msgstr ""
 "drakfirewall konfiguratzailea\n"
 "\n"
 "Mandriva Linux makina honentzako suhesi pertsonal bat konfiguratzen du.\n"
-"Suhesi ahaltsu eta dedikatu bat behar baduzu, Mandriva Security Firewall\n banaketari begiratu iezaiozu."
+"Suhesi ahaltsu eta dedikatu bat behar baduzu, Mandriva Security Firewall\n"
+" banaketari begiratu iezaiozu."
 
 #: ../lib/network/drakfirewall.pm:172
 #, c-format
@@ -5199,7 +5490,8 @@ msgid ""
 "into your computer.\n"
 "Please select which network activities should be watched."
 msgstr ""
-"Norbait zure konputagailuan muturra sartzen saiatu edo zerbitzu batera sartzen bada ohartarazia izan zaitezke.\n"
+"Norbait zure konputagailuan muturra sartzen saiatu edo zerbitzu batera "
+"sartzen bada ohartarazia izan zaitezke.\n"
 "Mesedez aukeratu zein sare jarduera gainbegiratu behar diren."
 
 #: ../lib/network/drakfirewall.pm:261
@@ -5255,7 +5547,8 @@ msgstr "Ezin da %s lotura mota hasieratu!"
 #: ../lib/network/drakvpn.pm:60
 #, c-format
 msgid "Please select an existing VPN connection or enter a new name."
-msgstr "Mesedez hautatu sortuta dagoen VPN lotura bat edo sartu izen berri bat."
+msgstr ""
+"Mesedez hautatu sortuta dagoen VPN lotura bat edo sartu izen berri bat."
 
 #: ../lib/network/drakvpn.pm:64
 #, c-format
@@ -5352,7 +5645,9 @@ msgstr "\"%s\" eraso bat egiten saiatu da %s"
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
-msgstr "\"%s\" aplikazioa zerbitzu bat (%s) sarean eskuragarri jartzen saiatzen ari da."
+msgstr ""
+"\"%s\" aplikazioa zerbitzu bat (%s) sarean eskuragarri jartzen saiatzen ari "
+"da."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:150
@@ -5393,12 +5688,7 @@ msgstr "Mesedez aukeratu Windows gidaria (.inf fitxategia)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Ezin da %s ndiswrapper gidaria instalatu!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Ezin da ndiswrapper modulua zamatu!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5407,7 +5697,12 @@ msgstr ""
 "Aukeratutako gailua %s gidariarekin konfiguratua izan da.\n"
 "Benetan erabili nahi duzu ndiswrapper gidaria?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Ezin da ndiswrapper modulua zamatu!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Ezin da ndiswrapper interfazea aurkitu!"
@@ -6091,7 +6386,9 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:135
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Zenbait osagai (%s) behar dira baino ez daude %s hardwarearentzako eskuragarri."
+msgstr ""
+"Zenbait osagai (%s) behar dira baino ez daude %s hardwarearentzako "
+"eskuragarri."
 
 #: ../lib/network/thirdparty.pm:136
 #, c-format
@@ -6121,7 +6418,12 @@ msgstr ""
 "Beharrezko fitxategiak URL honetatik ere instalatu daitezke:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Firmware fitxategiak behar dira gailu honekin."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Erabili disketea"
@@ -6321,3 +6623,5 @@ msgstr "Cisco-UDP kapsulazioa erabili"
 msgid "Use specific UDP port"
 msgstr "Erabili UDP ataka zehatza"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Inprimagailuak eransteak huts egin du."
diff --git a/po/fa.po b/po/fa.po
index 75e4438..0bc1959 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-fa\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -2028,12 +2028,7 @@ msgstr "تبریک می‌گوئیم!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2409,12 +2404,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2479,7 +2469,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4675,12 +4677,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4727,7 +4734,58 @@ msgstr "خودکار"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "ثبت‌ورود حساب (نام کاربر)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "گذرواژه"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "نام گواهینامه"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4811,7 +4869,182 @@ msgstr ""
 "\n"
 "دستورالعمل iwpriv(8( را برای اطلاعات بیشتر مطالعه کنید"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "پایان‌نامه"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "کشف-خودکار"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "حالت"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "نوع گواهینامه"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5322,19 +5555,19 @@ msgstr "لطفا راه‌انداز ویندوزی را انتخاب کنید (
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6028,7 +6261,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "استفاده از یک دیسکچه"
diff --git a/po/fi.po b/po/fi.po
index 48476c6..dbd5e04 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-fi - LE2005 Release\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-04-03 20:59+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -2037,12 +2037,7 @@ msgstr "Onnittelut"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2418,12 +2413,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2488,7 +2478,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4361,12 +4363,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4414,7 +4421,58 @@ msgstr "Automaattinen"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Käyttäjätunnus (käyttäjän nimi)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Salasana"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4498,7 +4556,182 @@ msgstr ""
 "\n"
 "Katso lisätietoja iwpriv(8) manuaalisivulta"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokolla"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automaattinen tunnistaminen"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Tila"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5010,19 +5243,19 @@ msgstr "Ole hyvä ja valitse Windows ajuri (.inf tiedosto)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5720,7 +5953,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Käytä levykettä"
diff --git a/po/fr.po b/po/fr.po
index ccc9635..58925dd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -74,7 +74,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-27 09:53+0100\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -2199,12 +2199,7 @@ msgstr "Félicitations"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "L'assistant a ajouté une imprimante partagé Samba avec succès"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Échec lors de l'ajout d'imprimantes."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2616,12 +2611,7 @@ msgstr "Bannière du serveur : "
 msgid "The wizard successfully configured your Samba server."
 msgstr "L'assistant a configuré votre serveur Samba avec succès."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Échec dans la configuration du serveur Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "L'assistant Samba s'est anormalement interrompu : "
@@ -2686,7 +2676,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Utilisateurs Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Échec dans la configuration du serveur Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba gère les partages Samba"
@@ -4897,12 +4899,17 @@ msgstr "WEP restreint"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA avec clé pré-partagée (PSK)"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Des fichiers firmware sont requis pour ce périphérique."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4951,7 +4958,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Mode de chiffrement"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Nom d'utilisateur du compte"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Mot de passe"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nom du certificat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -5039,7 +5097,182 @@ msgstr ""
 "\n"
 "Consultez la page de manuel iwpriv(8) pour plus d'informations."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocole"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-détecter"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Une clé de chiffrement est requise."
@@ -5567,12 +5800,7 @@ msgstr "Selectionnez le pilote Windows (fichier .inf) s'il vous plaît"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Impossible d'installer le pilote ndiswrapper %s !"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Impossible de charger le pilote ndiswrapper !"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5581,7 +5809,12 @@ msgstr ""
 "Le périphérique sélectionné a déjà été configuré avec le pilote %s.\n"
 "Désirez vous vraiment utiliser un pilote ndiswrapper ?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Impossible de charger le pilote ndiswrapper !"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Impossible de trouver l'interface ndiswrapper !"
@@ -6302,7 +6535,12 @@ msgstr ""
 "Les fichiers requis peuvent aussi être installés à partir de cette URL :\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Des fichiers firmware sont requis pour ce périphérique."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Utiliser une disquette"
@@ -6503,3 +6741,6 @@ msgstr "Utiliser l'encapsulation Cisco-UDP"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Utiliser un port UDP spécifique"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Échec lors de l'ajout d'imprimantes."
diff --git a/po/fur.po b/po/fur.po
index 46d861d..3f16e1d 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-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\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"
@@ -1983,12 +1983,7 @@ msgstr "Congratulazions"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2364,12 +2359,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2434,7 +2424,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4293,12 +4295,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4345,7 +4352,58 @@ msgstr ""
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Non utent"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Password"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4399,7 +4457,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "Auto Detect"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, c-format
+msgid "EAP Mode"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MSCHAPV2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4885,19 +5118,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5548,7 +5781,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 02bcb0f..ade7e60 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-09-12 18:04+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -1982,12 +1982,7 @@ msgstr "Comhghairdeas"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2363,12 +2358,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2433,7 +2423,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Úsáideoirí Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4303,12 +4305,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4355,7 +4362,58 @@ msgstr "Uathoibríoch"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Ainm úsáideora"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Pasfhocal"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Teastas"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4409,7 +4467,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Prótacal"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Braith go hUathoibríoch"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mód"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Teastas"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4895,19 +5128,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5558,7 +5791,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Sabháil ar dhiosca flapach"
diff --git a/po/gl.po b/po/gl.po
index d15bb44..93b0eec 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-gl\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-10 14:02+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <<gpul-traduccion@ceu.fi.udc.es>>\n"
@@ -2061,12 +2061,7 @@ msgstr "Noraboa"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "O asistente engadiu con éxito o recurso de impresora de Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Erro ó engadir impresoras."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2445,12 +2440,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "O asistente engadiu con éxito o recurso de impresora de Samba"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Erro ó Modificar o recurso Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2515,7 +2505,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Usuarios de Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Erro ó Modificar o recurso Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba administra os recursos Samba"
@@ -4529,12 +4531,17 @@ msgstr "WEP restrinxido"
 msgid "WPA Pre-Shared Key"
 msgstr "Clave WPA Pre-Compartida"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
-#, fuzzy, c-format
-msgid "Firmware files are required for this device."
-msgstr "Engadir unha impresora de fax para este dispositivo"
+#: ../lib/network/connection/wireless.pm:44
+#, c-format
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4581,7 +4588,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Modo de cifrado"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Login da conta (nome de usuario)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Contrasinal"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nome do certificado"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4658,7 +4716,182 @@ msgstr ""
 "\n"
 "Consulte a páxina man de iwpriv(8) para obter máis información."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocolo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Detección automática"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificado"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Requírese unha clave de cifrado."
@@ -5172,12 +5405,7 @@ msgstr "Seleccione o driver para Windows (ficheiro .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Non foi posible instalar o driver ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Non foi posible cargar o módulo ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5186,7 +5414,12 @@ msgstr ""
 "O dispositivo seleccionado xa está configurado co driver %s.\n"
 "Desexa usar un driver ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Non foi posible cargar o módulo ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Non foi posible atopar a interface ndiswrapper!"
@@ -5902,7 +6135,12 @@ msgstr ""
 "Os ficheiros requiridos tamén se poden instalar dende este URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, fuzzy, c-format
+msgid "Firmware files are required for this device."
+msgstr "Engadir unha impresora de fax para este dispositivo"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar un disquete"
@@ -6104,5 +6342,8 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr "Usar porto UDP específico"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Erro ó engadir impresoras."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Conseguir Axuda en Liña"
diff --git a/po/he.po b/po/he.po
index 6a601c5..feb0ab1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-19 03:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -580,7 +580,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "איחולינו! ממשק הרשת \"%s\" נמחק בהצלחה"
 
 #: ../bin/drakconnect:769
@@ -2056,7 +2057,8 @@ msgstr "הוספת שיתוף מדפסת מיוחד"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr "מטרת אשף זה ליצור בקלות שיתוף מדפסת מיוחד בסמבה"
 
 #: ../bin/draksambashare:455
@@ -2079,12 +2081,7 @@ msgstr "ברכותינו!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "האשף הוסיף בהצלחה את שיתוף המדפסת בסמבה"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "כשל בהוספת מדפסות."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "נא להוסיף או לבחור שיתוף מדפסת סמבה כדי שניתן יהיה לשנותו."
@@ -2196,7 +2193,8 @@ msgstr "ציבורי:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr "על מיסוך יצירה, מצב יצירה ומיסוך ספריה להיות מספריים כמו לדוגמה: 0755"
 
 #: ../bin/draksambashare:812
@@ -2249,7 +2247,9 @@ msgstr "אשף הגדרת שרת סמבה"
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
-msgstr "סמבה מאפשרת לשרת שלך להתנהג כשרת קבצים והדפסות לתחנות עבודה שמריצות מערכות שאינן לינוקס."
+msgstr ""
+"סמבה מאפשרת לשרת שלך להתנהג כשרת קבצים והדפסות לתחנות עבודה שמריצות מערכות "
+"שאינן לינוקס."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2265,7 +2265,8 @@ msgstr "שרת המוגדר כ-PDC אחראי להזדהות וינדוז ברח
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr "בהתקנות עם שרת יחיד ניתן להשתמש בתשתית smbpasswd או  tdbsam password"
 
 #: ../bin/draksambashare:1082
@@ -2458,12 +2459,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "האשף הוסיף בהצלחה את שיתוף המדפסת בסמבה"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "כשל בשינוי שיתוף הסמבה."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2528,7 +2524,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "משתמשי סמבה"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "כשל בשינוי שיתוף הסמבה."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba ניהול שיתופי סמבה"
@@ -4715,17 +4723,23 @@ msgstr "WEP מוגבל"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "קבצי קושחה נחוצים להתקן זה."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
-msgstr "פעולת כרטיס האלחוט שלך מבוטלת, נא להפעיל את מתג האלחוט (מתג ה-RF kill) תחילה."
+msgstr ""
+"פעולת כרטיס האלחוט שלך מבוטלת, נא להפעיל את מתג האלחוט (מתג ה-RF kill) תחילה."
 
 #: ../lib/network/connection/wireless.pm:322
 #, c-format
@@ -4767,7 +4781,58 @@ msgstr "אוטומטי"
 msgid "Encryption mode"
 msgstr "אופן הצפנה"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "שם משתמש (כניסה לחשבון)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "סיסמה"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "שם האישור"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, fuzzy, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4848,7 +4913,182 @@ msgstr ""
 "\n"
 "מידע נוסף בנושא זה ניתן למצוא בדף ההסבר iwpriv(8) man page."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "פרוטוקול"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "זיהוי-אוטומטי"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "אופן"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "אישור"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "דרוש מפתח הצפנה."
@@ -5366,12 +5606,7 @@ msgstr "עליך לבחור את מנהל ההתקן של חלונות (קובץ
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "התקנת מנהל ההתקן %s ndiswrapper נכשלה!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "טעינת המודול ndiswrapper נכשלה!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5380,7 +5615,12 @@ msgstr ""
 "ההתקן שנבחר כבר הוגדר עם התקן ההינע %s\n"
 "האם אתה בטוח שברצונך להשתמש בהתקן הינע עם Ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "טעינת המודול ndiswrapper נכשלה!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "אין אפשרות לאתר את מנשק ה-Ndiswrapper"
@@ -6087,7 +6327,12 @@ msgstr ""
 "ניתן להתקין את החבילות הנדרשות גם מכתובת זו:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "קבצי קושחה נחוצים להתקן זה."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "שימוש בתקליטון"
@@ -6127,7 +6372,8 @@ msgstr "נא להכניס תקליטון"
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
-msgstr "נא להכניס תקליטון מפורמט כ FAT לכונן %s, עם %s בספריית השורש, וללחוץ על %s"
+msgstr ""
+"נא להכניס תקליטון מפורמט כ FAT לכונן %s, עם %s בספריית השורש, וללחוץ על %s"
 
 #: ../lib/network/thirdparty.pm:228
 #, c-format
@@ -6285,3 +6531,5 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr "השתמש בשער UDP מסוים"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "כשל בהוספת מדפסות."
diff --git a/po/hi.po b/po/hi.po
index f554693..23c3eb5 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-hi\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-04-04 21:54+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी (Hindi) <dysxhi@yahoo.co.in>\n"
@@ -2022,12 +2022,7 @@ msgstr "बधाई हो"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2403,12 +2398,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2473,7 +2463,19 @@ msgstr "यूज़रड्रैक"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4420,12 +4422,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4472,7 +4479,58 @@ msgstr "स्वचालित"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "खाता संत्र-आरम्भ (उपयोगकर्ता का नाम)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "कूट-शब्द"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "प्रमाणपत्र का नाम"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4559,7 +4617,182 @@ msgstr ""
 "\n"
 "iwpriv(8) मैन पृष्ट को और अधिक सूचना के लिए देखें ।"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "प्रोटोकॉल"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "स्वतः-खोज़ी"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "पीऐपी"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "मोड"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "पीऐपी"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "सी०एच०ऐ०पी०"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "प्रमाणपत्र का प्रकार"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5070,19 +5303,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5771,7 +6004,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "एक फ़्लापी का उपयोग करें"
diff --git a/po/hr.po b/po/hr.po
index 6c263f2..809ce36 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 0\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-01-04 21:25+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -2023,12 +2023,7 @@ msgstr "Čestitamo, pobijedili ste!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2404,12 +2399,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2474,7 +2464,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4347,12 +4349,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4399,7 +4406,58 @@ msgstr "Automatski"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Korisničko ime"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Lozinka"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4453,7 +4511,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Koristi auto detekciju"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Način rada"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Tip certifikata"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4948,19 +5181,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5651,7 +5884,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Spremi na disketu"
diff --git a/po/hu.po b/po/hu.po
index 689099d..62621fa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-14 22:02+0100\n"
 "Last-Translator: Lónyai Gergely <alephlg@gmail.com>\n"
 "Language-Team: Hungarian <alephlg@gmail.com>\n"
@@ -2120,12 +2120,7 @@ msgstr "Gratulálunk"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "A varázsló felvette a Samba-nyomtatómegosztást."
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Nem sikerült felvenni a nyomtatókat."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2531,12 +2526,7 @@ msgstr "Kiszolgáló üzenete:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "A varázsló sikeresen beállította a Samba kiszolgálót."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Nem sikerült beállítani a Samba-kiszolgálót."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "A Samba-beállítás sikertelenségének oka:"
@@ -2601,7 +2591,19 @@ msgstr "UserDrake"
 msgid "Samba Users"
 msgstr "Samba-felhasználók"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Nem sikerült beállítani a Samba-kiszolgálót."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba - Samba-megosztások kezelése"
@@ -4821,10 +4823,15 @@ msgstr "Korlátozott WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA előzetesen megosztott kulcs"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Ehhez az eszközhöz firmware-fájlok szükségesek."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
 # Most laptops provide the ability for the
 # user to physically disable the radio.
@@ -4837,7 +4844,7 @@ msgstr "Ehhez az eszközhöz firmware-fájlok szükségesek."
 # making calls to turn the radio off and on.
 # This is referred to as a "software based
 # RF kill switch"
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4885,7 +4892,58 @@ msgstr "Automatikus"
 msgid "Encryption mode"
 msgstr "Titkosítási mód"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Felhasználónév"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Jelszó"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "A tanúsítvány neve"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4971,7 +5029,182 @@ msgstr ""
 "\n"
 "További információ az iwpriv(8) kézikönyvben."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatikus azonosítás"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mód"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Tanúsítvány"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Szükség van titkosítási kulcsra."
@@ -5499,12 +5732,7 @@ msgstr "Válassza ki a windowsos meghajtóprogramot (.inf-fájl)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Nem sikerült telepíteni a(z) \"%s\" Ndiswrapper-meghajtót."
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Nem sikerült betölteni az Ndiswrapper modult."
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5513,7 +5741,12 @@ msgstr ""
 "A kijelölt eszköz már be lett állítva a(z) \"%s\" meghajtóprogrammal.\n"
 "Valóban szeretne Ndiswrapper-meghajtóprogramot használni?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Nem sikerült betölteni az Ndiswrapper modult."
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Az Ndiswrapper-felület nem található."
@@ -6230,7 +6463,12 @@ msgstr ""
 "A szükséges fájlok telepíthetők erről a címről is:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Ehhez az eszközhöz firmware-fájlok szükségesek."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Floppy használata"
@@ -6431,3 +6669,6 @@ msgstr "Cisco-féle UDP-becsomagolás használata"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Megadott UDP-port használata"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Nem sikerült felvenni a nyomtatókat."
diff --git a/po/id.po b/po/id.po
index 9b97f86..0c7e509 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 0.1\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-12-01 08:45+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -2103,12 +2103,7 @@ msgstr "Selamat"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Wizard berhasil menambahkan share Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Gagal untuk menambah printer."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2488,12 +2483,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Wizard berhasil menambahkan share Samba"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Gagal untuk memodifikasi share Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2558,7 +2548,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Pengguna Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Gagal untuk memodifikasi share Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba mengelola share Samba"
@@ -4763,12 +4765,17 @@ msgstr "WEP terbatas"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Dengan Kunci Terbagi"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "File firmware diperlukan untuk divais ini."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4817,7 +4824,58 @@ msgstr "Automatis"
 msgid "Encryption mode"
 msgstr "Mode enkripsi"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Login Account (nama pengguna)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Katasandi"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nama sertifikat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4901,7 +4959,182 @@ msgstr ""
 "\n"
 "Lihat halaman manual iwpriv(8) untuk informasi lebih lanjut."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Deteksi otomatis"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Sertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Kunci enkripsi diperlukan."
@@ -5420,12 +5653,7 @@ msgstr "Silahkan pilih driver Windows (file .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Tidak bisa menginstall driver ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Tidak bisa memuat modul ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5434,7 +5662,12 @@ msgstr ""
 "Divais yang terpilih telah dikonfigurasi dengan driver %s.\n"
 "Apakah Anda hendak menggunakan driver ndsiwrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Tidak bisa memuat modul ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Tidak bisa menemukan antarmuka ndiswrapper!"
@@ -6152,7 +6385,12 @@ msgstr ""
 "File-file yang diperlukan juga dapat diinstall dari URL berikut:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "File firmware diperlukan untuk divais ini."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Gunakan disket"
@@ -6352,5 +6590,8 @@ msgstr "Gunakan enkapsulasi Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Gunakan port UDP spesifik"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Gagal untuk menambah printer."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Dapatkan Bantuan Online"
diff --git a/po/is.po b/po/is.po
index ae54ede..88251b0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-01-18 14:31+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -2088,12 +2088,7 @@ msgstr "Til hamingju"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Ráðgjafinn hefur bætt við Samba prentaramiðlun"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Gat ekki bætt við prentara."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Bættu við eða veldu miðlaðan Samba prentara til að vinna með."
@@ -2471,12 +2466,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Ráðgjafinn hefur bætt við Samba prentaramiðlun"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Mistókst að breyta Samba miðli."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2541,7 +2531,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba notendur"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Mistókst að breyta Samba miðli."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba sér um Samba miðlun"
@@ -4618,12 +4620,17 @@ msgstr "Lokaðir WEP lyklar"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA for-valinn lykill"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Vélbúnaðarrekla er þörf fyrir þetta tæki."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4670,7 +4677,58 @@ msgstr "Sjálfvirkt"
 msgid "Encryption mode"
 msgstr "Dulritunarmáti"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Netþjónustu-notandanafn"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Lykilorð"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nafn skírteinis"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4752,7 +4810,182 @@ msgstr ""
 "\n"
 "sjá nánar á man-síðunni fyrir iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Samskiptaregla"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Finna sjálfkrafa"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Hamur"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Skírteini"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Þarf að fá dulritunarlykil."
@@ -5272,12 +5505,7 @@ msgstr "Veldu Windows rekilinn (.inf skrá)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Get ekki sett inn %s ndiswrapper rekilinn!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Get ekki hlaðið inn ndiswrapper reklinum!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5286,7 +5514,12 @@ msgstr ""
 "Valið tæki hefur þegar verið sett upp með reklinum %s.\n"
 "vilt þú í raun nota ndiswrapper rekil?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Get ekki hlaðið inn ndiswrapper reklinum!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Finn ekki ndiswrapper tengið!"
@@ -5999,7 +6232,12 @@ msgstr ""
 "Skrárnar má einnig setja upp frá þessari slóð:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Vélbúnaðarrekla er þörf fyrir þetta tæki."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Nota diskling"
@@ -6198,5 +6436,8 @@ msgstr "Nota cisco-UDP til að umlykja samskiptareglu"
 msgid "Use specific UDP port"
 msgstr "Nota tiltekið UDP port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Gat ekki bætt við prentara."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Sækja nethjálp"
diff --git a/po/it.po b/po/it.po
index 9e0b7e2..8da6fa5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-27 22:50+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -2113,12 +2113,7 @@ msgstr "Congratulazioni"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "L'assistente ha aggiunto una stampante in condivisione Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "È stato impossibile aggiungere stampanti."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2499,12 +2494,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "L'assistente ha aggiunto una stampante in condivisione Samba"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "La modifica di una condivisione Samba non è riuscita."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2569,7 +2559,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Utenti Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "La modifica di una condivisione Samba non è riuscita."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba gestisce le condivisioni tramite Samba"
@@ -4770,12 +4772,17 @@ msgstr "WEP ristretto"
 msgid "WPA Pre-Shared Key"
 msgstr "Chiave WPA \"pre-shared\""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Per questa periferica è richiesto il file del firmware."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4824,7 +4831,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Modalità cifratura"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Login dell'account (nome utente)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Password"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nome del certificato"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4908,7 +4966,182 @@ msgstr ""
 "\n"
 "Sulla pagina man di iwpriv(8) puoi trovare ulteriori informazioni."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocollo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Riconoscimento automatico"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificato"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "E' richiesta una chiave di cifratura"
@@ -5434,12 +5667,7 @@ msgstr "Seleziona il driver Windows (file .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Impossibile installare il driver ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Impossibile caricare il modulo ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5448,7 +5676,12 @@ msgstr ""
 "Il dispositivo selezionato è già stato configurato con il driver %s.\n"
 "Vuoi davvero usare un driver ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Impossibile caricare il modulo ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Impossibile trovare l'interfaccia ndiswrapper!"
@@ -6166,7 +6399,12 @@ msgstr ""
 "I file richiesti possono essere installati anche da questo URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Per questa periferica è richiesto il file del firmware."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Utilizza un floppy"
@@ -6365,3 +6603,6 @@ msgstr "Usare l'incapsulamento Cisco-UDP"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Usare una specifica porta UDP"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "È stato impossibile aggiungere stampanti."
diff --git a/po/ja.po b/po/ja.po
index 11a98af..f7afbe4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-ja\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-04 20:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -2092,12 +2092,7 @@ msgstr "おめでとうございます"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Samba 共有プリンタの追加が完了しました"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "プリンタの追加に失敗しました。"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "変更するには Samba プリンタを追加または選択してください。"
@@ -2488,12 +2483,7 @@ msgstr "サーバのバナー:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Samba サーバの設定が完了しました。"
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Samba サーバの設定に失敗しました。"
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba 設定ウィザードが予期せず失敗しました:"
@@ -2558,7 +2548,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba ユーザ"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Samba サーバの設定に失敗しました。"
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba は Samba 共有を管理します"
@@ -4752,12 +4754,17 @@ msgstr "restricted モード WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 事前共有鍵 (PSK)"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "このデバイスにはファームウェアファイルが必要です。"
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4806,7 +4813,58 @@ msgstr "自動"
 msgid "Encryption mode"
 msgstr "暗号化モード"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "アカウントのログイン (ユーザ名)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "パスワード"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "証明書の名前"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4884,7 +4942,182 @@ msgstr ""
 "明されています。\n"
 "詳しくは man iwpriv(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "プロトコル"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "自動検出"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "モード"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "証明書"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "暗号鍵が必要です。"
@@ -5405,12 +5638,7 @@ msgstr "Windows のドライバ (.inf ファイル) を選んでください"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "%s ndiswrapper ドライバをインストールできません"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "ndiswrapper モジュールをロードできません"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5419,7 +5647,12 @@ msgstr ""
 "選択されたデバイスは %s ドライバで設定済みです。\n"
 "本当に ndiswrapper ドライバを使用しますか？"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "ndiswrapper モジュールをロードできません"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "ndiswrapper インターフェースが見つかりません"
@@ -6132,7 +6365,12 @@ msgstr ""
 "必要なファイルは次の URL からもインストールできます:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "このデバイスにはファームウェアファイルが必要です。"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "フロッピーを使う"
@@ -6331,3 +6569,6 @@ msgstr "Cisco-UDP カプセル化を使う"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "特定の UDP ポートを使う"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "プリンタの追加に失敗しました。"
diff --git a/po/ko.po b/po/ko.po
index 44b384f..6960331 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2002-09-09 09:08+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <beadaron@hanafos.com>\n"
@@ -2015,12 +2015,7 @@ msgstr "축하합니다."
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2396,12 +2391,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2466,7 +2456,19 @@ msgstr "사용자 드레이크"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4328,12 +4330,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4380,7 +4387,58 @@ msgstr "자동"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "로그인 계정(사용자명)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "암호"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4434,7 +4492,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "프로토콜"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "자동 검색"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "모드"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4925,19 +5158,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5622,7 +5855,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "플로피에 저장"
diff --git a/po/ky.po b/po/ky.po
index b26f305..2081449 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-ky\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-04-20 20:27+0500\n"
 "Last-Translator: Nurlan Borubaev <nurlan@tamga.info>\n"
 "Language-Team: Kyrgyz\n"
@@ -1982,12 +1982,7 @@ msgstr "Конфигурациялар"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2363,12 +2358,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2433,7 +2423,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4406,12 +4408,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4458,7 +4465,58 @@ msgstr "Авто"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Колдонуучу аты"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Пароль"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Сертификаттын аты"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4512,7 +4570,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Автоаныктоо"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Режим"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Сертификаттын тиби"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4998,19 +5231,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5665,7 +5898,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index a3432ff..1ce9f93 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net VERSION\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2000-12-23 13:50+0200\n"
 "Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -2011,12 +2011,7 @@ msgstr "Sveikinimai"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2392,12 +2387,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2462,7 +2452,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4326,12 +4328,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4378,7 +4385,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Pasisveikinimas (vartotojo vardas)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Slaptažodis"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4432,7 +4490,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokolas"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Naudokite automatinį aptikimą"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Režimas"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4918,19 +5151,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5605,7 +5838,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Išsaugoti į diskelį"
diff --git a/po/ltg.po b/po/ltg.po
index 3a3afa1..7223fcc 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-02-24 13:01+0200\n"
 "Last-Translator: Māris Laureckis <linux@latgola.lv>\n"
 "Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -2027,12 +2027,7 @@ msgstr "Apsveicam"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2408,12 +2403,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2478,7 +2468,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4348,12 +4350,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4400,7 +4407,58 @@ msgstr "Automatisks"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Konta nūsaukums (lītuotuoja vuords)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parole"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4454,7 +4512,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokols"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatiska nūteikšona"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modems"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4956,19 +5189,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5652,7 +5885,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Lītuot disketi"
diff --git a/po/lv.po b/po/lv.po
index f2ade28..1537149 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2002-09-27 17:45+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -2031,12 +2031,7 @@ msgstr "Apsveicam"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2412,12 +2407,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2482,7 +2472,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4347,12 +4349,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4399,7 +4406,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Konta nosaukums (lietotāja vārds)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parole"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4453,7 +4511,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokols"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automātiska noteikšana"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Režīms"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4955,19 +5188,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5654,7 +5887,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Saglabāt disketē"
diff --git a/po/mk.po b/po/mk.po
index 3992eff..1db006c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-mk\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-11-03 18:47+0100\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -2037,12 +2037,7 @@ msgstr "Честитки"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2418,12 +2413,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2488,7 +2478,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4362,12 +4364,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4414,7 +4421,58 @@ msgstr "Автоматски"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Најава на сметка (корисничко име)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Лозинка"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4468,7 +4526,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Авто-детекција"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Помести"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4977,19 +5210,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5679,7 +5912,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Употреби дискета"
diff --git a/po/mn.po b/po/mn.po
index 95ff69a..da30f76 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-01-02 00:35+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -1994,12 +1994,7 @@ msgstr "Баяр хүргэе!"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2375,12 +2370,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2445,7 +2435,19 @@ msgstr "Хэрэглэгчийн драке"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4311,12 +4313,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4363,7 +4370,58 @@ msgstr "Автомат"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Хэрэглэгчийн нэр"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Нууц үг"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4417,7 +4475,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Оролт/Гаралт-модул"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Автомат танилт"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Горим"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MSCHAPV2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4903,19 +5136,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5583,7 +5816,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Хадгалах"
diff --git a/po/ms.po b/po/ms.po
index fcea59e..8211431 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-28 19:29+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -13,8 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/drakconnect:61
-#: ../lib/network/netconnect.pm:118
+#: ../bin/drakconnect:61 ../lib/network/netconnect.pm:118
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
 msgstr "Alatan Konfigurasi Pelayan"
@@ -24,53 +23,40 @@ msgstr "Alatan Konfigurasi Pelayan"
 msgid "Network configuration (%d adapters)"
 msgstr "Alatan Konfigurasi Pelayan"
 
-#: ../bin/drakconnect:93
-#: ../bin/drakconnect:813
+#: ../bin/drakconnect:93 ../bin/drakconnect:813
 #, c-format
 msgid "Gateway:"
 msgstr "Gateway :"
 
-#: ../bin/drakconnect:93
-#: ../bin/drakconnect:813
+#: ../bin/drakconnect:93 ../bin/drakconnect:813
 #, c-format
 msgid "Interface:"
 msgstr "Antaramuka:"
 
-#: ../bin/drakconnect:97
-#: ../bin/net_monitor:119
+#: ../bin/drakconnect:97 ../bin/net_monitor:119
 #, fuzzy, c-format
 msgid "Wait please"
 msgstr "Sila Tunggu"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakinvictus:105
+#: ../bin/drakconnect:113 ../bin/drakinvictus:105
 #, c-format
 msgid "Interface"
 msgstr "Antaramuka"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakconnect:321
-#: ../bin/drakconnect:888
-#: ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:125
-#: ../lib/network/netconnect.pm:612
-#: ../lib/network/vpn/openvpn.pm:221
+#: ../bin/drakconnect:113 ../bin/drakconnect:321 ../bin/drakconnect:888
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:125
+#: ../lib/network/netconnect.pm:612 ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "Alamat IP"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakconnect:305
-#: ../bin/drakconnect:563
-#: ../bin/drakids:252
-#: ../bin/drakvpn-old:839
-#: ../lib/network/netconnect.pm:456
+#: ../bin/drakconnect:113 ../bin/drakconnect:305 ../bin/drakconnect:563
+#: ../bin/drakids:252 ../bin/drakvpn-old:839 ../lib/network/netconnect.pm:456
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../bin/drakconnect:113
-#: ../lib/network/netconnect.pm:442
+#: ../bin/drakconnect:113 ../lib/network/netconnect.pm:442
 #, c-format
 msgid "Driver"
 msgstr "Pemacu"
@@ -90,8 +76,7 @@ msgstr "Nama hos: "
 msgid "Configure hostname..."
 msgstr "Konfigur Panel"
 
-#: ../bin/drakconnect:146
-#: ../bin/drakconnect:851
+#: ../bin/drakconnect:146 ../bin/drakconnect:851
 #, fuzzy, c-format
 msgid "LAN configuration"
 msgstr "Tetapan KFish"
@@ -101,53 +86,38 @@ msgstr "Tetapan KFish"
 msgid "Configure Local Area Network..."
 msgstr "Konfigurasikan peranti dan sambungan rangkaian"
 
-#: ../bin/drakconnect:157
-#: ../bin/drakconnect:240
-#: ../bin/draknfs:186
+#: ../bin/drakconnect:157 ../bin/drakconnect:240 ../bin/draknfs:186
 #: ../bin/net_applet:138
 #, c-format
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../bin/drakconnect:159
-#: ../bin/drakconnect:241
-#: ../bin/drakconnect:245
+#: ../bin/drakconnect:159 ../bin/drakconnect:241 ../bin/drakconnect:245
 #: ../bin/drakinvictus:140
 #, c-format
 msgid "Apply"
 msgstr "Terap"
 
-#: ../bin/drakconnect:161
-#: ../bin/drakconnect:943
-#: ../bin/drakconnect:1034
-#: ../bin/draknetprofile:106
-#: ../bin/net_monitor:341
+#: ../bin/drakconnect:161 ../bin/drakconnect:943 ../bin/drakconnect:1034
+#: ../bin/draknetprofile:106 ../bin/net_monitor:341
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../bin/drakconnect:162
-#: ../bin/drakconnect:858
-#: ../bin/drakconnect:945
-#: ../bin/drakconnect:1035
-#: ../bin/draknetprofile:108
-#: ../bin/net_monitor:342
+#: ../bin/drakconnect:162 ../bin/drakconnect:858 ../bin/drakconnect:945
+#: ../bin/drakconnect:1035 ../bin/draknetprofile:108 ../bin/net_monitor:342
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../bin/drakconnect:164
-#: ../bin/drakconnect:636
-#: ../bin/drakgw:359
-#: ../bin/draksambashare:228
-#: ../lib/network/connection_manager.pm:146
+#: ../bin/drakconnect:164 ../bin/drakconnect:636 ../bin/drakgw:359
+#: ../bin/draksambashare:228 ../lib/network/connection_manager.pm:146
 #: ../lib/network/connection_manager.pm:164
 #, c-format
 msgid "Please wait"
 msgstr "Sila tunggu"
 
-#: ../bin/drakconnect:166
-#: ../bin/drakconnect:638
+#: ../bin/drakconnect:166 ../bin/drakconnect:638
 #, fuzzy, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr ""
@@ -159,8 +129,7 @@ msgstr ""
 msgid "Manage connections"
 msgstr "Urus sambungan"
 
-#: ../bin/drakconnect:219
-#: ../lib/network/drakroam.pm:105
+#: ../bin/drakconnect:219 ../lib/network/drakroam.pm:105
 #, c-format
 msgid "Device: "
 msgstr "Peranti "
@@ -170,18 +139,14 @@ msgstr "Peranti "
 msgid "IP configuration"
 msgstr "Tetapan KFish"
 
-#: ../bin/drakconnect:326
-#: ../bin/drakconnect:889
-#: ../bin/drakgw:177
+#: ../bin/drakconnect:326 ../bin/drakconnect:889 ../bin/drakgw:177
 #: ../lib/network/connection/ethernet.pm:132
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../bin/drakconnect:332
-#: ../lib/network/connection/ethernet.pm:133
-#: ../lib/network/netconnect.pm:644
-#: ../lib/network/vpn/openvpn.pm:212
+#: ../bin/drakconnect:332 ../lib/network/connection/ethernet.pm:133
+#: ../lib/network/netconnect.pm:644 ../lib/network/vpn/openvpn.pm:212
 #: ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
@@ -197,8 +162,7 @@ msgstr "Pelayan Rangkaian"
 msgid "Search Domain"
 msgstr "Kosongkan Carian"
 
-#: ../bin/drakconnect:351
-#: ../bin/drakvpn-old:837
+#: ../bin/drakconnect:351 ../bin/drakvpn-old:837
 #, c-format
 msgid "none"
 msgstr "tiada"
@@ -213,119 +177,100 @@ msgstr "statik"
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../bin/drakconnect:369
-#: ../bin/drakconnect:892
+#: ../bin/drakconnect:369 ../bin/drakconnect:892
 #: ../lib/network/connection/ethernet.pm:143
 #, fuzzy, c-format
 msgid "DHCP client"
 msgstr "Klien MSN"
 
-#: ../bin/drakconnect:373
-#: ../lib/network/connection/ethernet.pm:201
+#: ../bin/drakconnect:373 ../lib/network/connection/ethernet.pm:201
 #, fuzzy, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCP"
 
-#: ../bin/drakconnect:375
-#: ../lib/network/connection/ethernet.pm:147
+#: ../bin/drakconnect:375 ../lib/network/connection/ethernet.pm:147
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Tetap Nama Imej"
 
-#: ../bin/drakconnect:379
-#: ../lib/network/connection/ethernet.pm:144
+#: ../bin/drakconnect:379 ../lib/network/connection/ethernet.pm:144
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "tetap masatamat dalam saat"
 
-#: ../bin/drakconnect:382
-#: ../lib/network/connection/ethernet.pm:136
+#: ../bin/drakconnect:382 ../lib/network/connection/ethernet.pm:136
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Alamat IP DCC:"
 
-#: ../bin/drakconnect:383
-#: ../lib/network/connection/ethernet.pm:145
+#: ../bin/drakconnect:383 ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
-#: ../bin/drakconnect:384
-#: ../lib/network/connection/ethernet.pm:146
+#: ../bin/drakconnect:384 ../lib/network/connection/ethernet.pm:146
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
-#: ../bin/drakconnect:406
-#: ../lib/network/connection/wireless.pm:327
+#: ../bin/drakconnect:406 ../lib/network/connection/wireless.pm:327
 #: ../lib/network/connection_manager.pm:204
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "M-x nxml-mode"
 
-#: ../bin/drakconnect:407
-#: ../lib/network/connection/wireless.pm:331
+#: ../bin/drakconnect:407 ../lib/network/connection/wireless.pm:331
 #, fuzzy, c-format
 msgid "Network name (ESSID)"
 msgstr "Tetap Nama Imej"
 
-#: ../bin/drakconnect:408
-#: ../lib/network/connection/wireless.pm:337
+#: ../bin/drakconnect:408 ../lib/network/connection/wireless.pm:337
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Id Bina."
 
-#: ../bin/drakconnect:409
-#: ../lib/network/connection/wireless.pm:338
+#: ../bin/drakconnect:409 ../lib/network/connection/wireless.pm:338
 #, fuzzy, c-format
 msgid "Operating frequency"
 msgstr "Sistem Pengoperasian"
 
-#: ../bin/drakconnect:410
-#: ../lib/network/connection/wireless.pm:339
+#: ../bin/drakconnect:410 ../lib/network/connection/wireless.pm:339
 #, fuzzy, c-format
 msgid "Sensitivity threshold"
 msgstr "Kesensitifan (10-32767):"
 
-#: ../bin/drakconnect:411
-#: ../lib/network/connection/wireless.pm:340
+#: ../bin/drakconnect:411 ../lib/network/connection/wireless.pm:340
 #, fuzzy, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Sedang Diguna"
 
-#: ../bin/drakconnect:421
-#: ../lib/network/connection/wireless.pm:335
+#: ../bin/drakconnect:421 ../lib/network/connection/wireless.pm:335
 #, c-format
 msgid "Encryption key"
 msgstr "Kekunci enkripsi"
 
-#: ../bin/drakconnect:422
-#: ../lib/network/connection/wireless.pm:341
+#: ../bin/drakconnect:422 ../lib/network/connection/wireless.pm:341
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../bin/drakconnect:423
-#: ../lib/network/connection/wireless.pm:349
+#: ../bin/drakconnect:423 ../lib/network/connection/wireless.pm:349
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Dokumentasi"
 
-#: ../bin/drakconnect:424
-#: ../lib/network/connection/wireless.pm:350
+#: ../bin/drakconnect:424 ../lib/network/connection/wireless.pm:350
 #, fuzzy, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../bin/drakconnect:425
-#: ../lib/network/connection/wireless.pm:358
+#: ../bin/drakconnect:425 ../lib/network/connection/wireless.pm:358
 #, fuzzy, c-format
 msgid "iwspy command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
 
-#: ../bin/drakconnect:426
-#: ../lib/network/connection/wireless.pm:367
+#: ../bin/drakconnect:426 ../lib/network/connection/wireless.pm:367
 #, fuzzy, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
@@ -335,98 +280,82 @@ msgstr "Ralat menghurai hujah senarai arahan: %s"
 msgid "Start at boot"
 msgstr "Boot Microsoft Windows"
 
-#: ../bin/drakconnect:440
-#: ../lib/network/connection/ethernet.pm:221
+#: ../bin/drakconnect:440 ../lib/network/connection/ethernet.pm:221
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Pelayan Rangkaian"
 
-#: ../bin/drakconnect:446
-#: ../lib/network/netconnect.pm:331
+#: ../bin/drakconnect:446 ../lib/network/netconnect.pm:331
 #, fuzzy, c-format
 msgid "Dialing mode"
 msgstr "M-x nxml-mode"
 
-#: ../bin/drakconnect:451
-#: ../bin/drakconnect:518
+#: ../bin/drakconnect:451 ../bin/drakconnect:518
 #: ../lib/network/netconnect.pm:332
 #, fuzzy, c-format
 msgid "Connection speed"
 msgstr "Sambungan Gagal"
 
-#: ../bin/drakconnect:456
-#: ../lib/network/netconnect.pm:333
+#: ../bin/drakconnect:456 ../lib/network/netconnect.pm:333
 #, fuzzy, c-format
 msgid "Connection timeout (in sec)"
 msgstr "tetap masatamat dalam saat"
 
-#: ../bin/drakconnect:462
-#: ../lib/network/connection.pm:186
+#: ../bin/drakconnect:462 ../lib/network/connection.pm:186
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../bin/drakconnect:482
-#: ../lib/network/connection/cable.pm:48
+#: ../bin/drakconnect:482 ../lib/network/connection/cable.pm:48
 #: ../lib/network/netconnect.pm:595
 #, c-format
 msgid "Authentication"
 msgstr "Pengesahan"
 
-#: ../bin/drakconnect:492
-#: ../lib/network/connection/cable.pm:50
-#: ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:334
+#: ../bin/drakconnect:492 ../lib/network/connection/cable.pm:50
+#: ../lib/network/connection/ppp.pm:22 ../lib/network/netconnect.pm:334
 #: ../lib/network/vpn/openvpn.pm:393
 #, fuzzy, c-format
 msgid "Account Login (user name)"
 msgstr "Masukkan nama logmasuk untuk akaun ini."
 
-#: ../bin/drakconnect:493
-#: ../lib/network/connection/cable.pm:52
-#: ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:335
+#: ../bin/drakconnect:493 ../lib/network/connection/cable.pm:52
+#: ../lib/network/connection/ppp.pm:23 ../lib/network/netconnect.pm:335
 #: ../lib/network/vpn/openvpn.pm:394
 #, fuzzy, c-format
 msgid "Account Password"
 msgstr "Kata Laluan & Akaun Pengguna"
 
-#: ../bin/drakconnect:494
-#: ../lib/network/netconnect.pm:328
+#: ../bin/drakconnect:494 ../lib/network/netconnect.pm:328
 #, fuzzy, c-format
 msgid "Provider phone number"
 msgstr "Ubah jumlah lajur"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:10
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:10
 #: ../lib/network/netconnect.pm:75
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:11
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:11
 #: ../lib/network/netconnect.pm:76
 #, fuzzy, c-format
 msgid "Terminal-based"
 msgstr "Berasaskan:"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:9
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:9
 #: ../lib/network/netconnect.pm:74
 #, fuzzy, c-format
 msgid "Script-based"
 msgstr "Berasaskan:"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:12
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:12
 #: ../lib/network/netconnect.pm:77
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:13
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:13
 #: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "PAP/CHAP"
@@ -467,50 +396,42 @@ msgstr "Sila Tunggu"
 msgid "Modem sound"
 msgstr "Bunyi & Video"
 
-#: ../bin/drakconnect:543
-#: ../bin/drakgw:101
+#: ../bin/drakconnect:543 ../bin/drakgw:101
 #, c-format
 msgid "Enable"
 msgstr "Hidupkan"
 
-#: ../bin/drakconnect:543
-#: ../bin/drakgw:101
+#: ../bin/drakconnect:543 ../bin/drakgw:101
 #, c-format
 msgid "Disable"
 msgstr "Lumpuh"
 
-#: ../bin/drakconnect:555
-#: ../lib/network/netconnect.pm:336
+#: ../bin/drakconnect:555 ../lib/network/netconnect.pm:336
 #, fuzzy, c-format
 msgid "Card IRQ"
 msgstr "Permainan Kad"
 
-#: ../bin/drakconnect:556
-#: ../lib/network/netconnect.pm:337
+#: ../bin/drakconnect:556 ../lib/network/netconnect.pm:337
 #, fuzzy, c-format
 msgid "Card mem (DMA)"
 msgstr "Kad Elektronik Perniagaan"
 
-#: ../bin/drakconnect:557
-#: ../lib/network/netconnect.pm:338
+#: ../bin/drakconnect:557 ../lib/network/netconnect.pm:338
 #, fuzzy, c-format
 msgid "Card IO"
 msgstr "Port IO"
 
-#: ../bin/drakconnect:558
-#: ../lib/network/netconnect.pm:339
+#: ../bin/drakconnect:558 ../lib/network/netconnect.pm:339
 #, fuzzy, c-format
 msgid "Card IO_0"
 msgstr "Port IO"
 
-#: ../bin/drakconnect:564
-#: ../lib/network/netconnect.pm:67
+#: ../bin/drakconnect:564 ../lib/network/netconnect.pm:67
 #, fuzzy, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Eropah Tengah, Macintosh"
 
-#: ../bin/drakconnect:565
-#: ../lib/network/netconnect.pm:68
+#: ../bin/drakconnect:565 ../lib/network/netconnect.pm:68
 #, fuzzy, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -552,113 +473,72 @@ msgstr "Kursor S&ibuk"
 msgid "Location on the bus"
 msgstr "dikemaskini pada %(date)s"
 
-#: ../bin/drakconnect:676
-#: ../bin/drakconnect:680
-#: ../bin/drakconnect:689
-#: ../bin/drakconnect:705
-#: ../bin/drakgw:184
-#: ../bin/drakhosts:100
-#: ../bin/drakhosts:245
-#: ../bin/drakhosts:252
-#: ../bin/drakhosts:259
-#: ../bin/drakinvictus:72
-#: ../bin/draknetprofile:113
-#: ../bin/draknfs:88
-#: ../bin/draknfs:109
-#: ../bin/draknfs:279
-#: ../bin/draknfs:412
-#: ../bin/draknfs:414
-#: ../bin/draknfs:417
-#: ../bin/draknfs:509
-#: ../bin/draknfs:516
-#: ../bin/draknfs:579
-#: ../bin/draknfs:586
-#: ../bin/draknfs:593
-#: ../bin/draksambashare:393
-#: ../bin/draksambashare:400
-#: ../bin/draksambashare:403
-#: ../bin/draksambashare:455
-#: ../bin/draksambashare:479
-#: ../bin/draksambashare:545
-#: ../bin/draksambashare:560
-#: ../bin/draksambashare:638
-#: ../bin/draksambashare:705
-#: ../bin/draksambashare:805
-#: ../bin/draksambashare:812
-#: ../bin/draksambashare:951
-#: ../bin/draksambashare:1105
-#: ../bin/draksambashare:1124
-#: ../bin/draksambashare:1156
-#: ../bin/draksambashare:1213
-#: ../bin/draksambashare:1263
-#: ../bin/draksambashare:1365
-#: ../bin/draksambashare:1374
-#: ../bin/draksambashare:1396
-#: ../bin/draksambashare:1405
-#: ../bin/draksambashare:1424
-#: ../bin/draksambashare:1433
-#: ../bin/draksambashare:1445
-#: ../lib/network/connection/xdsl.pm:332
+#: ../bin/drakconnect:676 ../bin/drakconnect:680 ../bin/drakconnect:689
+#: ../bin/drakconnect:705 ../bin/drakgw:184 ../bin/drakhosts:100
+#: ../bin/drakhosts:245 ../bin/drakhosts:252 ../bin/drakhosts:259
+#: ../bin/drakinvictus:72 ../bin/draknetprofile:113 ../bin/draknfs:88
+#: ../bin/draknfs:109 ../bin/draknfs:279 ../bin/draknfs:412 ../bin/draknfs:414
+#: ../bin/draknfs:417 ../bin/draknfs:509 ../bin/draknfs:516 ../bin/draknfs:579
+#: ../bin/draknfs:586 ../bin/draknfs:593 ../bin/draksambashare:393
+#: ../bin/draksambashare:400 ../bin/draksambashare:403
+#: ../bin/draksambashare:455 ../bin/draksambashare:479
+#: ../bin/draksambashare:545 ../bin/draksambashare:560
+#: ../bin/draksambashare:638 ../bin/draksambashare:705
+#: ../bin/draksambashare:805 ../bin/draksambashare:812
+#: ../bin/draksambashare:951 ../bin/draksambashare:1105
+#: ../bin/draksambashare:1124 ../bin/draksambashare:1156
+#: ../bin/draksambashare:1213 ../bin/draksambashare:1263
+#: ../bin/draksambashare:1365 ../bin/draksambashare:1374
+#: ../bin/draksambashare:1396 ../bin/draksambashare:1405
+#: ../bin/draksambashare:1424 ../bin/draksambashare:1433
+#: ../bin/draksambashare:1445 ../lib/network/connection/xdsl.pm:332
 #: ../lib/network/connection_manager.pm:41
 #: ../lib/network/connection_manager.pm:47
 #: ../lib/network/connection_manager.pm:60
 #: ../lib/network/connection_manager.pm:115
-#: ../lib/network/connection_manager.pm:119
-#: ../lib/network/drakvpn.pm:45
-#: ../lib/network/drakvpn.pm:52
-#: ../lib/network/ndiswrapper.pm:27
-#: ../lib/network/ndiswrapper.pm:42
-#: ../lib/network/ndiswrapper.pm:86
-#: ../lib/network/ndiswrapper.pm:102
-#: ../lib/network/netconnect.pm:131
-#: ../lib/network/netconnect.pm:179
-#: ../lib/network/netconnect.pm:235
-#: ../lib/network/netconnect.pm:276
-#: ../lib/network/netconnect.pm:821
-#: ../lib/network/thirdparty.pm:115
-#: ../lib/network/thirdparty.pm:132
-#: ../lib/network/thirdparty.pm:215
-#: ../lib/network/thirdparty.pm:217
+#: ../lib/network/connection_manager.pm:119 ../lib/network/drakvpn.pm:45
+#: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:27
+#: ../lib/network/ndiswrapper.pm:42 ../lib/network/ndiswrapper.pm:86
+#: ../lib/network/ndiswrapper.pm:102 ../lib/network/netconnect.pm:131
+#: ../lib/network/netconnect.pm:179 ../lib/network/netconnect.pm:235
+#: ../lib/network/netconnect.pm:276 ../lib/network/netconnect.pm:821
+#: ../lib/network/thirdparty.pm:115 ../lib/network/thirdparty.pm:132
+#: ../lib/network/thirdparty.pm:215 ../lib/network/thirdparty.pm:217
 #: ../lib/network/thirdparty.pm:238
 #, c-format
 msgid "Error"
 msgstr "Ralat"
 
-#: ../bin/drakconnect:676
-#: ../lib/network/connection/ethernet.pm:160
+#: ../bin/drakconnect:676 ../lib/network/connection/ethernet.pm:160
 #, fuzzy, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP dalam"
 
-#: ../bin/drakconnect:680
-#: ../lib/network/connection/ethernet.pm:165
+#: ../bin/drakconnect:680 ../lib/network/connection/ethernet.pm:165
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Gateway dalam"
 
-#: ../bin/drakconnect:685
-#: ../bin/drakconnect:767
-#: ../bin/drakconnect:953
+#: ../bin/drakconnect:685 ../bin/drakconnect:767 ../bin/drakconnect:953
 #, fuzzy, c-format
 msgid "No IP"
 msgstr "Tiada Fail"
 
-#: ../bin/drakconnect:686
-#: ../bin/drakconnect:768
+#: ../bin/drakconnect:686 ../bin/drakconnect:768
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Tiada Fail"
 
-#: ../bin/drakconnect:689
-#: ../lib/network/netconnect.pm:806
+#: ../bin/drakconnect:689 ../lib/network/netconnect.pm:806
 #, fuzzy, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gateway dalam"
 
-#: ../bin/drakconnect:705
-#: ../bin/drakgw:307
+#: ../bin/drakconnect:705 ../bin/drakgw:307
 #, fuzzy, c-format
-msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
 msgstr "Tidak on."
 
 #: ../bin/drakconnect:714
@@ -671,9 +551,7 @@ msgstr "Maklumat antara muka rangkaian"
 msgid "Select the network interface to remove:"
 msgstr "Anda mesti memilih kekunci zon untuk dibuang."
 
-#: ../bin/drakconnect:719
-#: ../bin/drakgw:123
-#: ../lib/network/netconnect.pm:358
+#: ../bin/drakconnect:719 ../bin/drakgw:123 ../lib/network/netconnect.pm:358
 #: ../lib/network/netconnect.pm:393
 #, fuzzy, c-format
 msgid "Net Device"
@@ -689,7 +567,8 @@ msgstr "A"
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr ""
 
 #: ../bin/drakconnect:769
@@ -702,14 +581,12 @@ msgstr "Naik"
 msgid "down"
 msgstr "_Turun"
 
-#: ../bin/drakconnect:804
-#: ../bin/net_monitor:465
+#: ../bin/drakconnect:804 ../bin/net_monitor:465
 #, c-format
 msgid "Connected"
 msgstr "Tersambung"
 
-#: ../bin/drakconnect:804
-#: ../bin/net_monitor:465
+#: ../bin/drakconnect:804 ../bin/net_monitor:465
 #, c-format
 msgid "Not connected"
 msgstr "Tidak disambung"
@@ -773,20 +650,15 @@ msgstr "dalam utama"
 msgid "Internet connection configuration"
 msgstr "Alatan Konfigurasi Pelayan"
 
-#: ../bin/drakconnect:979
-#: ../bin/draknetprofile:129
-#: ../bin/draknetprofile:131
-#: ../bin/drakproxy:36
-#: ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:92
+#: ../bin/drakconnect:979 ../bin/draknetprofile:129 ../bin/draknetprofile:131
+#: ../bin/drakproxy:36 ../lib/network/drakvpn.pm:70
+#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:92
 #: ../lib/network/netconnect.pm:479
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../bin/drakconnect:981
-#: ../bin/net_applet:69
+#: ../bin/drakconnect:981 ../bin/net_applet:69
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -794,8 +666,7 @@ msgid ""
 msgstr "dalam utama"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: ../bin/drakconnect:982
-#: ../bin/net_applet:70
+#: ../bin/drakconnect:982 ../bin/net_applet:70
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Name=Network Interface"
@@ -805,14 +676,12 @@ msgstr "Name=Network Interface"
 msgid "Host name (optional)"
 msgstr "Tetap Nama Imej"
 
-#: ../bin/drakconnect:997
-#: ../lib/network/netconnect.pm:630
+#: ../bin/drakconnect:997 ../lib/network/netconnect.pm:630
 #, fuzzy, c-format
 msgid "First DNS Server (optional)"
 msgstr "Masukkan Nama Pelayan DNS"
 
-#: ../bin/drakconnect:998
-#: ../lib/network/netconnect.pm:631
+#: ../bin/drakconnect:998 ../lib/network/netconnect.pm:631
 #, fuzzy, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Masukkan Nama Pelayan DNS"
@@ -832,8 +701,7 @@ msgstr "Alatan Konfigurasi Pelayan"
 msgid "Internet access"
 msgstr "Akses Internet"
 
-#: ../bin/drakconnect:1024
-#: ../bin/net_monitor:98
+#: ../bin/drakconnect:1024 ../bin/net_monitor:98
 #, fuzzy, c-format
 msgid "Connection type: "
 msgstr "Jenis per&nomboran:"
@@ -843,8 +711,7 @@ msgstr "Jenis per&nomboran:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../bin/drakconnect:1028
-#: ../lib/network/netconnect.pm:712
+#: ../bin/drakconnect:1028 ../lib/network/netconnect.pm:712
 #, fuzzy, c-format
 msgid "Testing your connection..."
 msgstr "Pasukan Mandriva Anda."
@@ -863,11 +730,14 @@ msgstr "Tetapkan Perkongsian Fail"
 #, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
-"With that feature, other computers on your local network will be able to use this computer's Internet connection.\n"
+"With that feature, other computers on your local network will be able to use "
+"this computer's Internet connection.\n"
 "\n"
-"Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
 msgstr "Internet on lokal Internet Rangkaian Internet Rangkaian Rangkaian."
 
 #: ../bin/drakgw:91
@@ -910,7 +780,9 @@ msgstr "on am Rangkaian."
 
 #: ../bin/drakgw:152
 #, fuzzy, c-format
-msgid "Please choose what network adapter will be connected to your Local Area Network."
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
 msgstr "Rangkaian."
 
 #: ../bin/drakgw:173
@@ -918,8 +790,7 @@ msgstr "Rangkaian."
 msgid "Local Area Network settings"
 msgstr "Sila masukkan tetapan rangkaian tempatan anda:"
 
-#: ../bin/drakgw:176
-#: ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:176 ../lib/network/vpn/openvpn.pm:227
 #, fuzzy, c-format
 msgid "Local IP address"
 msgstr "Layari Rangkaian Tempatan"
@@ -1032,7 +903,8 @@ msgstr "Internet dimatikan."
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
-"You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP) and\n"
+"You may now share Internet connection with other computers on your Local "
+"Area Network, using automatic network configuration (DHCP) and\n"
 " a Transparent Proxy Cache server (SQUID)."
 msgstr "Semuanya Internet on Rangkaian DHCP."
 
@@ -1048,7 +920,9 @@ msgstr "Tiada peranti dikesan !"
 
 #: ../bin/drakgw:374
 #, fuzzy, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
 msgstr "Amaran."
 
 #: ../bin/drakgw:379
@@ -1096,13 +970,9 @@ msgstr "Nama Medan"
 msgid "Host Aliases:"
 msgstr "Hos tidak diketahui"
 
-#: ../bin/drakhosts:122
-#: ../bin/drakhosts:128
-#: ../bin/draksambashare:229
-#: ../bin/draksambashare:250
-#: ../bin/draksambashare:397
-#: ../bin/draksambashare:634
-#: ../bin/draksambashare:801
+#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draksambashare:229
+#: ../bin/draksambashare:250 ../bin/draksambashare:397
+#: ../bin/draksambashare:634 ../bin/draksambashare:801
 #, c-format
 msgid "Error!"
 msgstr "Ralat!"
@@ -1117,8 +987,7 @@ msgstr "Sila masukkan alamat IP yang sah."
 msgid "Same IP is already in %s file."
 msgstr "Fail ini telah ada didalam tong sampah."
 
-#: ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:203
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:203
 #, c-format
 msgid "Host name"
 msgstr "Nama hos"
@@ -1128,25 +997,19 @@ msgstr "Nama hos"
 msgid "Host Aliases"
 msgstr "Hos tidak diketahui"
 
-#: ../bin/drakhosts:206
-#: ../bin/drakhosts:236
+#: ../bin/drakhosts:206 ../bin/drakhosts:236
 #, c-format
 msgid "Manage hosts definitions"
 msgstr "Urus takrifan hos"
 
-#: ../bin/drakhosts:222
-#: ../bin/drakhosts:249
+#: ../bin/drakhosts:222 ../bin/drakhosts:249
 #, fuzzy, c-format
 msgid "Modify entry"
 msgstr "Ubahsuai Gaya"
 
-#: ../bin/drakhosts:241
-#: ../bin/draknfs:575
-#: ../bin/draksambashare:1358
-#: ../bin/draksambashare:1389
-#: ../bin/draksambashare:1420
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakhosts:241 ../bin/draknfs:575 ../bin/draksambashare:1358
+#: ../bin/draksambashare:1389 ../bin/draksambashare:1420
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Add"
 msgstr "Tambah"
@@ -1162,11 +1025,8 @@ msgstr "T_ambah Semua"
 msgid "Failed to add host."
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: ../bin/drakhosts:248
-#: ../bin/draknfs:582
-#: ../bin/draksambashare:1315
-#: ../bin/draksambashare:1360
-#: ../bin/draksambashare:1391
+#: ../bin/drakhosts:248 ../bin/draknfs:582 ../bin/draksambashare:1315
+#: ../bin/draksambashare:1360 ../bin/draksambashare:1391
 #: ../bin/draksambashare:1428
 #, c-format
 msgid "Modify"
@@ -1177,16 +1037,10 @@ msgstr "Ubah"
 msgid "Failed to Modify host."
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: ../bin/drakhosts:255
-#: ../bin/drakids:87
-#: ../bin/drakids:96
-#: ../bin/draknfs:589
-#: ../bin/draksambashare:1316
-#: ../bin/draksambashare:1368
-#: ../bin/draksambashare:1399
-#: ../bin/draksambashare:1436
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakhosts:255 ../bin/drakids:87 ../bin/drakids:96 ../bin/draknfs:589
+#: ../bin/draksambashare:1316 ../bin/draksambashare:1368
+#: ../bin/draksambashare:1399 ../bin/draksambashare:1436
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Remove"
 msgstr "Buang"
@@ -1196,11 +1050,8 @@ msgstr "Buang"
 msgid "Failed to remove host."
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: ../bin/drakhosts:262
-#: ../bin/drakinvictus:141
-#: ../bin/draknetprofile:147
-#: ../bin/net_applet:139
-#: ../lib/network/drakroam.pm:113
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:147
+#: ../bin/net_applet:139 ../lib/network/drakroam.pm:113
 #: ../lib/network/netcenter.pm:113
 #, c-format
 msgid "Quit"
@@ -1211,64 +1062,39 @@ msgstr "Keluar"
 msgid "Allowed addresses"
 msgstr "Alamat Yang Ada"
 
-#: ../bin/drakids:41
-#: ../bin/drakids:65
-#: ../bin/drakids:181
-#: ../bin/drakids:190
-#: ../bin/drakids:215
-#: ../bin/drakids:224
-#: ../bin/drakids:234
-#: ../bin/drakids:326
-#: ../bin/net_applet:78
-#: ../bin/net_applet:245
-#: ../bin/net_applet:521
-#: ../bin/net_applet:548
-#: ../lib/network/drakfirewall.pm:255
+#: ../bin/drakids:41 ../bin/drakids:65 ../bin/drakids:181 ../bin/drakids:190
+#: ../bin/drakids:215 ../bin/drakids:224 ../bin/drakids:234 ../bin/drakids:326
+#: ../bin/net_applet:78 ../bin/net_applet:245 ../bin/net_applet:521
+#: ../bin/net_applet:548 ../lib/network/drakfirewall.pm:255
 #: ../lib/network/drakfirewall.pm:258
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "_Konfigurasikan Firewall"
 
-#: ../bin/drakids:65
-#: ../bin/drakids:181
-#: ../bin/drakids:190
-#: ../bin/drakids:215
-#: ../bin/drakids:224
-#: ../bin/drakids:234
-#: ../bin/drakids:326
-#: ../bin/net_applet:245
-#: ../bin/net_applet:521
+#: ../bin/drakids:65 ../bin/drakids:181 ../bin/drakids:190 ../bin/drakids:215
+#: ../bin/drakids:224 ../bin/drakids:234 ../bin/drakids:326
+#: ../bin/net_applet:245 ../bin/net_applet:521
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Tidak boleh untuk akses ke CDROM"
 
-#: ../bin/drakids:74
-#: ../bin/drakids:102
+#: ../bin/drakids:74 ../bin/drakids:102
 #, c-format
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:78
-#: ../bin/drakids:97
-#: ../bin/net_applet:665
+#: ../bin/drakids:78 ../bin/drakids:97 ../bin/net_applet:665
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Benarkan Toolbar Tersendiri"
 
-#: ../bin/drakids:79
-#: ../bin/drakids:88
-#: ../bin/net_applet:666
+#: ../bin/drakids:79 ../bin/drakids:88 ../bin/net_applet:666
 #, fuzzy, c-format
 msgid "Block"
 msgstr "Teks Blok"
 
-#: ../bin/drakids:80
-#: ../bin/drakids:89
-#: ../bin/drakids:98
-#: ../bin/drakids:109
-#: ../bin/drakids:122
-#: ../bin/drakids:130
-#: ../bin/draknfs:191
+#: ../bin/drakids:80 ../bin/drakids:89 ../bin/drakids:98 ../bin/drakids:109
+#: ../bin/drakids:122 ../bin/drakids:130 ../bin/draknfs:191
 #: ../bin/net_monitor:120
 #, c-format
 msgid "Close"
@@ -1289,16 +1115,12 @@ msgstr "Konfigurasi Servis Sistem"
 msgid "Clear logs"
 msgstr "P&adam Semua"
 
-#: ../bin/drakids:107
-#: ../bin/drakids:112
-#: ../bin/net_applet:609
+#: ../bin/drakids:107 ../bin/drakids:112 ../bin/net_applet:609
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:108
-#: ../bin/drakids:125
-#: ../bin/net_applet:614
+#: ../bin/drakids:108 ../bin/drakids:125 ../bin/net_applet:614
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -1333,8 +1155,7 @@ msgstr "Perincian bagi '%s'"
 msgid "Attack type"
 msgstr "Jenis per&nomboran:"
 
-#: ../bin/drakids:250
-#: ../bin/drakids:283
+#: ../bin/drakids:250 ../bin/drakids:283
 #, c-format
 msgid "Service"
 msgstr "Servis"
@@ -1381,7 +1202,9 @@ msgstr "Kata Laluan & Akaun Pengguna"
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
 msgstr ""
 
 #: ../bin/drakinvictus:102
@@ -1404,8 +1227,7 @@ msgstr "Pengurus Mesin Maya"
 msgid "Virtual ID"
 msgstr "Id Bina."
 
-#: ../bin/drakinvictus:110
-#: ../lib/network/netconnect.pm:594
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:594
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -1448,7 +1270,9 @@ msgstr "Profil Baru..."
 
 #: ../bin/draknetprofile:102
 #, c-format
-msgid "Name of the profile to create (the new profile is created as a copy of the current one):"
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one):"
 msgstr ""
 
 #: ../bin/draknetprofile:113
@@ -1468,7 +1292,9 @@ msgstr ""
 
 #: ../bin/draknetprofile:141
 #, c-format
-msgid "This tool allows to activate an existing network profile, and to manage (clone, delete) profiles."
+msgid ""
+"This tool allows to activate an existing network profile, and to manage "
+"(clone, delete) profiles."
 msgstr ""
 
 #: ../bin/draknetprofile:141
@@ -1511,49 +1337,39 @@ msgstr "Tiada pengguna dinyatakan, tiada nama untuk uid %d.\n"
 msgid "allow real remote root access"
 msgstr ""
 
-#: ../bin/draknfs:61
-#: ../bin/draknfs:62
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:174
-#: ../bin/draksambashare:175
+#: ../bin/draknfs:61 ../bin/draknfs:62 ../bin/draknfs:63
+#: ../bin/draksambashare:174 ../bin/draksambashare:175
 #: ../bin/draksambashare:176
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../bin/draknfs:62
-#: ../bin/draksambashare:175
+#: ../bin/draknfs:62 ../bin/draksambashare:175
 #, fuzzy, c-format
 msgid "/_Write conf"
 msgstr "Dokumen Microsoft Write"
 
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:176
+#: ../bin/draknfs:63 ../bin/draksambashare:176
 #, c-format
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:176
+#: ../bin/draknfs:63 ../bin/draksambashare:176
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../bin/draknfs:66
-#: ../bin/draknfs:67
-#: ../bin/draknfs:68
+#: ../bin/draknfs:66 ../bin/draknfs:67 ../bin/draknfs:68
 #, fuzzy, c-format
 msgid "/_NFS Server"
 msgstr "Pelayan FTP"
 
-#: ../bin/draknfs:67
-#: ../bin/draksambashare:180
+#: ../bin/draknfs:67 ../bin/draksambashare:180
 #, fuzzy, c-format
 msgid "/_Restart"
 msgstr "Hidupkan semula"
 
-#: ../bin/draknfs:68
-#: ../bin/draksambashare:181
+#: ../bin/draknfs:68 ../bin/draksambashare:181
 #, c-format
 msgid "/R_eload"
 msgstr ""
@@ -1573,14 +1389,12 @@ msgstr "Sila masukkan pelayan NFS."
 msgid "Error Restarting/Reloading NFS server"
 msgstr ""
 
-#: ../bin/draknfs:104
-#: ../bin/draksambashare:245
+#: ../bin/draknfs:104 ../bin/draksambashare:245
 #, fuzzy, c-format
 msgid "Directory Selection"
 msgstr "Padam pilihan"
 
-#: ../bin/draknfs:109
-#: ../bin/draksambashare:250
+#: ../bin/draknfs:109 ../bin/draksambashare:250
 #, c-format
 msgid "Should be a directory."
 msgstr "Sepatutnya adalah direktori."
@@ -1588,19 +1402,28 @@ msgstr "Sepatutnya adalah direktori."
 #: ../bin/draknfs:140
 #, c-format
 msgid ""
-"<span weight=\"bold\">NFS clients</span> may be specified in a number of ways:\n"
+"<span weight=\"bold\">NFS clients</span> may be specified in a number of "
+"ways:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">single host:</span> a host either by an abbreviated name recognized be the resolver, fully qualified domain name, or an IP address\n"
+"<span foreground=\"royalblue3\">single host:</span> a host either by an "
+"abbreviated name recognized be the resolver, fully qualified domain name, or "
+"an IP address\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">netgroups:</span> NIS netgroups may be given as @group.\n"
+"<span foreground=\"royalblue3\">netgroups:</span> NIS netgroups may be given "
+"as @group.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">wildcards:</span> machine names may contain the wildcard characters * and ?. For instance: *.cs.foo.edu  matches all  hosts  in the domain cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">wildcards:</span> machine names may contain "
+"the wildcard characters * and ?. For instance: *.cs.foo.edu  matches all  "
+"hosts  in the domain cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP networks:</span> you can also export directories to all hosts on an IP (sub-)network simultaneously. for example, either `/255.255.252.0' or  `/22'  appended to the network base address result.\n"
+"<span foreground=\"royalblue3\">IP networks:</span> you can also export "
+"directories to all hosts on an IP (sub-)network simultaneously. for example, "
+"either `/255.255.252.0' or  `/22'  appended to the network base address "
+"result.\n"
 msgstr ""
 
 #: ../bin/draknfs:155
@@ -1609,16 +1432,24 @@ msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">map root user as anonymous:</span> map requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
+"<span foreground=\"royalblue3\">map root user as anonymous:</span> map "
+"requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">allow real remote root access:</span> turn off root squashing. This option is mainly useful for diskless clients (no_root_squash).\n"
+"<span foreground=\"royalblue3\">allow real remote root access:</span> turn "
+"off root squashing. This option is mainly useful for diskless clients "
+"(no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map all uids and gids to the anonymous  user (all_squash). Useful for NFS-exported public FTP directories, news spool directories, etc. The opposite option is no user UID mapping (no_all_squash), which is the default setting.\n"
+"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map "
+"all uids and gids to the anonymous  user (all_squash). Useful for NFS-"
+"exported public FTP directories, news spool directories, etc. The opposite "
+"option is no user UID mapping (no_all_squash), which is the default "
+"setting.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set the uid and gid of the anonymous account.\n"
+"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set "
+"the uid and gid of the anonymous account.\n"
 msgstr ""
 
 #: ../bin/draknfs:171
@@ -1648,27 +1479,38 @@ msgstr "Pilihan Bina"
 
 #: ../bin/draknfs:177
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> this option requires that requests originate on an internet port less than IPPORT_RESERVED (1024). This option is on by default."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> this option requires that requests "
+"originate on an internet port less than IPPORT_RESERVED (1024). This option "
+"is on by default."
 msgstr ""
 
 #: ../bin/draknfs:178
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> allow either only read or both read and write requests on this NFS volume. The default is to disallow any request which changes the filesystem. This can also be made explicit by using this option."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> allow either only read or both "
+"read and write requests on this NFS volume. The default is to disallow any "
+"request which changes the filesystem. This can also be made explicit by "
+"using this option."
 msgstr ""
 
 #: ../bin/draknfs:179
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> disallows the NFS server to violate the NFS protocol and to reply to requests before any changes made by these requests have been committed to stable storage (e.g. disc drive)."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> disallows the NFS server to "
+"violate the NFS protocol and to reply to requests before any changes made by "
+"these requests have been committed to stable storage (e.g. disc drive)."
 msgstr ""
 
 #: ../bin/draknfs:180
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> enable subtree checking which can help improve security in some cases, but can decrease reliability. See exports(5) man page for more details."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> enable subtree checking which can "
+"help improve security in some cases, but can decrease reliability. See "
+"exports(5) man page for more details."
 msgstr ""
 
-#: ../bin/draknfs:185
-#: ../bin/draksambashare:632
-#: ../bin/draksambashare:799
+#: ../bin/draknfs:185 ../bin/draksambashare:632 ../bin/draksambashare:799
 #, c-format
 msgid "Information"
 msgstr "Maklumat"
@@ -1688,8 +1530,7 @@ msgstr "Pengepos Kemasukan Blog"
 msgid "Please add an NFS share to be able to modify it."
 msgstr ""
 
-#: ../bin/draknfs:353
-#: ../bin/draksambashare:607
+#: ../bin/draknfs:353 ../bin/draksambashare:607
 #, fuzzy, c-format
 msgid "Advanced options"
 msgstr "Pilihan Bina"
@@ -1699,9 +1540,7 @@ msgstr "Pilihan Bina"
 msgid "NFS directory"
 msgstr "pemilih direktori"
 
-#: ../bin/draknfs:369
-#: ../bin/draksambashare:381
-#: ../bin/draksambashare:597
+#: ../bin/draknfs:369 ../bin/draksambashare:381 ../bin/draksambashare:597
 #: ../bin/draksambashare:776
 #, c-format
 msgid "Directory:"
@@ -1772,9 +1611,7 @@ msgstr "Pilihan Umum"
 msgid "Custom Options"
 msgstr "Pilihan Bina"
 
-#: ../bin/draknfs:509
-#: ../bin/draksambashare:397
-#: ../bin/draksambashare:634
+#: ../bin/draknfs:509 ../bin/draksambashare:397 ../bin/draksambashare:634
 #: ../bin/draksambashare:801
 #, fuzzy, c-format
 msgid "Please enter a directory to share."
@@ -1820,27 +1657,23 @@ msgstr "keluar dan dalam"
 msgid "User name"
 msgstr "Nama user"
 
-#: ../bin/draksambashare:71
-#: ../bin/draksambashare:99
+#: ../bin/draksambashare:71 ../bin/draksambashare:99
 #, c-format
 msgid "Share name"
 msgstr "Nama perkongsian"
 
-#: ../bin/draksambashare:72
-#: ../bin/draksambashare:100
+#: ../bin/draksambashare:72 ../bin/draksambashare:100
 #, fuzzy, c-format
 msgid "Share directory"
 msgstr "pemilih direktori"
 
-#: ../bin/draksambashare:73
-#: ../bin/draksambashare:101
+#: ../bin/draksambashare:73 ../bin/draksambashare:101
 #: ../bin/draksambashare:118
 #, c-format
 msgid "Comment"
 msgstr "Komen"
 
-#: ../bin/draksambashare:74
-#: ../bin/draksambashare:119
+#: ../bin/draksambashare:74 ../bin/draksambashare:119
 #, fuzzy, c-format
 msgid "Browseable"
 msgstr "Lungsur"
@@ -1850,20 +1683,17 @@ msgstr "Lungsur"
 msgid "Public"
 msgstr "Awam"
 
-#: ../bin/draksambashare:76
-#: ../bin/draksambashare:124
+#: ../bin/draksambashare:76 ../bin/draksambashare:124
 #, fuzzy, c-format
 msgid "Writable"
 msgstr "_Boleh Tulis"
 
-#: ../bin/draksambashare:77
-#: ../bin/draksambashare:165
+#: ../bin/draksambashare:77 ../bin/draksambashare:165
 #, fuzzy, c-format
 msgid "Create mask"
 msgstr "Hasilkan fax"
 
-#: ../bin/draksambashare:78
-#: ../bin/draksambashare:166
+#: ../bin/draksambashare:78 ../bin/draksambashare:166
 #, fuzzy, c-format
 msgid "Directory mask"
 msgstr "pemilih direktori"
@@ -1873,21 +1703,18 @@ msgstr "pemilih direktori"
 msgid "Read list"
 msgstr "Senarai Arab"
 
-#: ../bin/draksambashare:80
-#: ../bin/draksambashare:125
+#: ../bin/draksambashare:80 ../bin/draksambashare:125
 #: ../bin/draksambashare:611
 #, fuzzy, c-format
 msgid "Write list"
 msgstr "Senarai Arab"
 
-#: ../bin/draksambashare:81
-#: ../bin/draksambashare:157
+#: ../bin/draksambashare:81 ../bin/draksambashare:157
 #, fuzzy, c-format
 msgid "Admin users"
 msgstr "Pengguna dan Kumpulan"
 
-#: ../bin/draksambashare:82
-#: ../bin/draksambashare:158
+#: ../bin/draksambashare:82 ../bin/draksambashare:158
 #, fuzzy, c-format
 msgid "Valid users"
 msgstr "Pengguna dan Kumpulan"
@@ -1897,20 +1724,17 @@ msgstr "Pengguna dan Kumpulan"
 msgid "Inherit Permissions"
 msgstr "War&isi label"
 
-#: ../bin/draksambashare:84
-#: ../bin/draksambashare:159
+#: ../bin/draksambashare:84 ../bin/draksambashare:159
 #, fuzzy, c-format
 msgid "Hide dot files"
 msgstr "Semua Fail Imej"
 
-#: ../bin/draksambashare:85
-#: ../bin/draksambashare:160
+#: ../bin/draksambashare:85 ../bin/draksambashare:160
 #, fuzzy, c-format
 msgid "Hide files"
 msgstr "&Fail Terbaru"
 
-#: ../bin/draksambashare:86
-#: ../bin/draksambashare:164
+#: ../bin/draksambashare:86 ../bin/draksambashare:164
 #, fuzzy, c-format
 msgid "Preserve case"
 msgstr "&Padan huruf"
@@ -1925,8 +1749,7 @@ msgstr "Cipta dokumen baru"
 msgid "Force group"
 msgstr "Paksa teks LTR"
 
-#: ../bin/draksambashare:89
-#: ../bin/draksambashare:163
+#: ../bin/draksambashare:89 ../bin/draksambashare:163
 #, fuzzy, c-format
 msgid "Default case"
 msgstr "&Padan huruf"
@@ -1941,8 +1764,7 @@ msgstr "Nama Medan"
 msgid "Path"
 msgstr "Laluan"
 
-#: ../bin/draksambashare:120
-#: ../bin/draksambashare:603
+#: ../bin/draksambashare:120 ../bin/draksambashare:603
 #, fuzzy, c-format
 msgid "Printable"
 msgstr "Hidupkan"
@@ -1962,8 +1784,7 @@ msgstr "Arahan pencetak: "
 msgid "Guest ok"
 msgstr "Dialog OK:"
 
-#: ../bin/draksambashare:126
-#: ../bin/draksambashare:167
+#: ../bin/draksambashare:126 ../bin/draksambashare:167
 #: ../bin/draksambashare:612
 #, fuzzy, c-format
 msgid "Inherit permissions"
@@ -2004,10 +1825,8 @@ msgstr "Paksa teks LTR"
 msgid "Force create group"
 msgstr "Cipta dokumen baru"
 
-#: ../bin/draksambashare:178
-#: ../bin/draksambashare:179
-#: ../bin/draksambashare:180
-#: ../bin/draksambashare:181
+#: ../bin/draksambashare:178 ../bin/draksambashare:179
+#: ../bin/draksambashare:180 ../bin/draksambashare:181
 #, fuzzy, c-format
 msgid "/_Samba Server"
 msgstr "Pelayan FTP"
@@ -2027,8 +1846,7 @@ msgstr "B&antuan"
 msgid "/Samba Documentation"
 msgstr "Dokumentasi Fedora"
 
-#: ../bin/draksambashare:189
-#: ../bin/draksambashare:190
+#: ../bin/draksambashare:189 ../bin/draksambashare:190
 #, c-format
 msgid "/_About"
 msgstr "/_Perihal"
@@ -2079,8 +1897,7 @@ msgstr "Tetapan Lanjutan Pelayan Samba"
 msgid "Error Restarting/Reloading Samba server"
 msgstr "Sila masukkan pelayan NFS."
 
-#: ../bin/draksambashare:369
-#: ../bin/draksambashare:576
+#: ../bin/draksambashare:369 ../bin/draksambashare:576
 #: ../bin/draksambashare:697
 #, c-format
 msgid "Open"
@@ -2101,8 +1918,7 @@ msgstr "T_ambah Semua"
 msgid "Name of the share:"
 msgstr "Nama Medan"
 
-#: ../bin/draksambashare:380
-#: ../bin/draksambashare:596
+#: ../bin/draksambashare:380 ../bin/draksambashare:596
 #: ../bin/draksambashare:777
 #, c-format
 msgid "Comment:"
@@ -2110,7 +1926,9 @@ msgstr "Komen:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
 msgstr ""
 
 #: ../bin/draksambashare:400
@@ -2118,8 +1936,7 @@ msgstr ""
 msgid "Can't create the directory, please enter a correct path."
 msgstr ""
 
-#: ../bin/draksambashare:403
-#: ../bin/draksambashare:632
+#: ../bin/draksambashare:403 ../bin/draksambashare:632
 #: ../bin/draksambashare:799
 #, fuzzy, c-format
 msgid "Please enter a Comment for this share."
@@ -2142,7 +1959,8 @@ msgstr ""
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 
 #: ../bin/draksambashare:455
@@ -2155,8 +1973,7 @@ msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
 msgid "Printers and print$ already exist."
 msgstr "Profil \"%s\" telah wujud!"
 
-#: ../bin/draksambashare:529
-#: ../bin/draksambashare:1199
+#: ../bin/draksambashare:529 ../bin/draksambashare:1199
 #, c-format
 msgid "Congratulations"
 msgstr "Tahniah"
@@ -2166,12 +1983,7 @@ msgstr "Tahniah"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, fuzzy, c-format
-msgid "Failed to add printers."
-msgstr "Gagal untuk mencari seksyen: %s"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2191,14 +2003,12 @@ msgstr "Arahan pencetak: "
 msgid "Printer name:"
 msgstr "Nama Medan"
 
-#: ../bin/draksambashare:601
-#: ../bin/draksambashare:782
+#: ../bin/draksambashare:601 ../bin/draksambashare:782
 #, fuzzy, c-format
 msgid "Writable:"
 msgstr "_Boleh Tulis"
 
-#: ../bin/draksambashare:602
-#: ../bin/draksambashare:783
+#: ../bin/draksambashare:602 ../bin/draksambashare:783
 #, c-format
 msgid "Browseable:"
 msgstr ""
@@ -2285,7 +2095,8 @@ msgstr "Awam"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 
 #: ../bin/draksambashare:812
@@ -2335,7 +2146,9 @@ msgstr "Alatan tetapan pelayan dan klien fax"
 
 #: ../bin/draksambashare:1066
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
 msgstr ""
 
 #: ../bin/draksambashare:1082
@@ -2345,17 +2158,22 @@ msgstr ""
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
 msgstr ""
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Domain master = yes, causes the server to register the NetBIOS name <pdc name>. This name will be recognized by other servers."
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>. This name will be recognized by other servers."
 msgstr ""
 
 #: ../bin/draksambashare:1099
@@ -2380,7 +2198,12 @@ msgstr "Sempadan Tahap:"
 
 #: ../bin/draksambashare:1101
 #, c-format
-msgid "The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34"
+msgid ""
+"The global os level option dictates the operating system level at which "
+"Samba will masquerade during a browser election. If you wish to have Samba "
+"win an election and become the master browser, you can set the level above "
+"that of the operating system on your network with the highest current value. "
+"ie: os level = 34"
 msgstr ""
 
 #: ../bin/draksambashare:1105
@@ -2398,8 +2221,7 @@ msgstr "Kumpulan Kerja Windows"
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../bin/draksambashare:1119
-#: ../bin/draksambashare:1183
+#: ../bin/draksambashare:1119 ../bin/draksambashare:1183
 #, fuzzy, c-format
 msgid "Workgroup:"
 msgstr "Kumpulan Kerja Windows"
@@ -2414,15 +2236,16 @@ msgstr "Nama Medan"
 msgid "The Workgroup is wrong."
 msgstr "Pilihan Semasa adalah Kosong"
 
-#: ../bin/draksambashare:1131
-#: ../bin/draksambashare:1141
+#: ../bin/draksambashare:1131 ../bin/draksambashare:1141
 #, fuzzy, c-format
 msgid "Security mode"
 msgstr "M-x nxml-mode"
 
 #: ../bin/draksambashare:1131
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
 msgstr ""
 
 #: ../bin/draksambashare:1131
@@ -2432,7 +2255,10 @@ msgstr ""
 
 #: ../bin/draksambashare:1131
 #, c-format
-msgid "Domain level: provides a mechanism for storing all user and group accounts in a central, shared, account repository. The centralized account repository is shared between domain (security) controllers."
+msgid ""
+"Domain level: provides a mechanism for storing all user and group accounts "
+"in a central, shared, account repository. The centralized account repository "
+"is shared between domain (security) controllers."
 msgstr ""
 
 #: ../bin/draksambashare:1142
@@ -2447,7 +2273,9 @@ msgstr "Pelayan FTP"
 
 #: ../bin/draksambashare:1147
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr ""
 
 #: ../bin/draksambashare:1152
@@ -2467,7 +2295,9 @@ msgstr "Log Sistem"
 
 #: ../bin/draksambashare:1163
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
 msgstr ""
 
 #: ../bin/draksambashare:1163
@@ -2480,8 +2310,7 @@ msgstr ""
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr ""
 
-#: ../bin/draksambashare:1170
-#: ../bin/draksambashare:1185
+#: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, fuzzy, c-format
 msgid "Log file:"
 msgstr "Fail Log Aplikasi"
@@ -2503,12 +2332,16 @@ msgstr ""
 
 #: ../bin/draksambashare:1177
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
 msgstr ""
 
 #: ../bin/draksambashare:1177
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
 
 #: ../bin/draksambashare:1182
@@ -2526,12 +2359,7 @@ msgstr "Pelayan FTP"
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Gagal menukar maklumat usia untuk %s: %s\n"
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2596,7 +2424,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Status Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Gagal menukar maklumat usia untuk %s: %s\n"
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, fuzzy, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "Cipta, ubahsuai, dan padam pengkongsian samba"
@@ -2626,15 +2466,12 @@ msgstr ""
 msgid "disable"
 msgstr ""
 
-#: ../bin/drakvpn-old:93
-#: ../bin/drakvpn-old:119
+#: ../bin/drakvpn-old:93 ../bin/drakvpn-old:119
 #, fuzzy, c-format
 msgid "reconfigure"
 msgstr "Ulangtetap"
 
-#: ../bin/drakvpn-old:93
-#: ../bin/drakvpn-old:119
-#: ../bin/drakvpn-old:432
+#: ../bin/drakvpn-old:93 ../bin/drakvpn-old:119 ../bin/drakvpn-old:432
 #, c-format
 msgid "dismiss"
 msgstr ""
@@ -2679,8 +2516,7 @@ msgstr ""
 msgid "The VPN connection is now enabled."
 msgstr ""
 
-#: ../bin/drakvpn-old:147
-#: ../bin/drakvpn-old:164
+#: ../bin/drakvpn-old:147 ../bin/drakvpn-old:164
 #, fuzzy, c-format
 msgid "Simple VPN setup."
 msgstr "Pelihat imej ringkas"
@@ -2749,8 +2585,7 @@ msgid ""
 "What would you like to configure?\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:245
-#: ../bin/drakvpn-old:382
+#: ../bin/drakvpn-old:245 ../bin/drakvpn-old:382
 #, c-format
 msgid "%s entries"
 msgstr ""
@@ -2769,29 +2604,24 @@ msgid ""
 "What would you like to do?\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid ""
 "_:display here is a verb\n"
 "Display"
 msgstr ""
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Edit"
 msgstr "Edit"
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Commit"
 msgstr ""
 
-#: ../bin/drakvpn-old:267
-#: ../bin/drakvpn-old:271
-#: ../bin/drakvpn-old:406
+#: ../bin/drakvpn-old:267 ../bin/drakvpn-old:271 ../bin/drakvpn-old:406
 #: ../bin/drakvpn-old:410
 #, c-format
 msgid ""
@@ -2819,8 +2649,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:333
-#: ../bin/drakvpn-old:523
+#: ../bin/drakvpn-old:333 ../bin/drakvpn-old:523
 #, fuzzy, c-format
 msgid "Edit section"
 msgstr "&Seksyen RTL"
@@ -2834,9 +2663,7 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:337
-#: ../bin/drakvpn-old:357
-#: ../bin/drakvpn-old:528
+#: ../bin/drakvpn-old:337 ../bin/drakvpn-old:357 ../bin/drakvpn-old:528
 #: ../bin/drakvpn-old:574
 #, fuzzy, c-format
 msgid "Section names"
@@ -2852,14 +2679,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:353
-#: ../bin/drakvpn-old:570
+#: ../bin/drakvpn-old:353 ../bin/drakvpn-old:570
 #, fuzzy, c-format
 msgid "Remove section"
 msgstr "&Seksyen RTL"
 
-#: ../bin/drakvpn-old:354
-#: ../bin/drakvpn-old:571
+#: ../bin/drakvpn-old:354 ../bin/drakvpn-old:571
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -2964,8 +2789,7 @@ msgid ""
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
-#: ../bin/drakvpn-old:467
-#: ../bin/drakvpn-old:560
+#: ../bin/drakvpn-old:467 ../bin/drakvpn-old:560
 #, fuzzy, c-format
 msgid "real file"
 msgstr "Extension &fail:"
@@ -3226,11 +3050,11 @@ msgid ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n"
+"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
+"'hour'.\n"
 msgstr ""
 
-#: ../bin/drakvpn-old:728
-#: ../bin/drakvpn-old:813
+#: ../bin/drakvpn-old:728 ../bin/drakvpn-old:813
 #, fuzzy, c-format
 msgid "Encryption algorithm"
 msgstr "_Kekunci Enkripsi"
@@ -3291,16 +3115,12 @@ msgstr ""
 msgid "Generate policy"
 msgstr ""
 
-#: ../bin/drakvpn-old:758
-#: ../bin/drakvpn-old:774
-#: ../bin/drakvpn-old:787
+#: ../bin/drakvpn-old:758 ../bin/drakvpn-old:774 ../bin/drakvpn-old:787
 #, c-format
 msgid "off"
 msgstr ""
 
-#: ../bin/drakvpn-old:758
-#: ../bin/drakvpn-old:774
-#: ../bin/drakvpn-old:787
+#: ../bin/drakvpn-old:758 ../bin/drakvpn-old:774 ../bin/drakvpn-old:787
 #, fuzzy, c-format
 msgid "on"
 msgstr "Berasaskan:"
@@ -3473,8 +3293,7 @@ msgstr "Imej Jarak Dinamik Tinggi"
 msgid "Upper-layer protocol"
 msgstr "Audio MPEG Lapisan 2"
 
-#: ../bin/drakvpn-old:833
-#: ../bin/drakvpn-old:840
+#: ../bin/drakvpn-old:833 ../bin/drakvpn-old:840
 #, fuzzy, c-format
 msgid "any"
 msgstr "(padan sebarang dari berikut)"
@@ -3574,14 +3393,12 @@ msgstr ""
 msgid "Network is down on interface %s."
 msgstr "Rangkaian tidak dapat dicapai."
 
-#: ../bin/net_applet:75
-#: ../bin/net_monitor:468
+#: ../bin/net_applet:75 ../bin/net_monitor:468
 #, fuzzy, c-format
 msgid "Connect %s"
 msgstr "Sambung"
 
-#: ../bin/net_applet:76
-#: ../bin/net_monitor:468
+#: ../bin/net_applet:76 ../bin/net_monitor:468
 #, fuzzy, c-format
 msgid "Disconnect %s"
 msgstr "Putus"
@@ -3611,9 +3428,7 @@ msgstr "Tetapkan Rangkaian"
 msgid "Watched interface"
 msgstr "Antaramuka Pengguna"
 
-#: ../bin/net_applet:88
-#: ../bin/net_applet:89
-#: ../bin/net_applet:91
+#: ../bin/net_applet:88 ../bin/net_applet:89 ../bin/net_applet:91
 #, fuzzy, c-format
 msgid "Auto-detect"
 msgstr "Auto-kesan kemera"
@@ -3628,12 +3443,9 @@ msgstr "Antara Muka Rangkaian"
 msgid "Profiles"
 msgstr "Profi:"
 
-#: ../bin/net_applet:130
-#: ../lib/network/connection.pm:170
-#: ../lib/network/drakvpn.pm:62
-#: ../lib/network/vpn/openvpn.pm:365
-#: ../lib/network/vpn/openvpn.pm:379
-#: ../lib/network/vpn/openvpn.pm:390
+#: ../bin/net_applet:130 ../lib/network/connection.pm:170
+#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
+#: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, fuzzy, c-format
 msgid "VPN connection"
 msgstr "Sambungan Gagal"
@@ -3663,8 +3475,7 @@ msgstr "Sentiasa lancar ketika permulaan"
 msgid "Wireless networks"
 msgstr "Cari rangkaian tanpawayar"
 
-#: ../bin/net_applet:489
-#: ../bin/net_monitor:96
+#: ../bin/net_applet:489 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "Setting"
@@ -3739,8 +3550,7 @@ msgstr ""
 msgid "Ignore"
 msgstr "Abai"
 
-#: ../bin/net_applet:637
-#: ../bin/net_applet:650
+#: ../bin/net_applet:637 ../bin/net_applet:650
 #, fuzzy, c-format
 msgid "Interactive Firewall: new service"
 msgstr "Penyelarasan kamera gagal."
@@ -3755,8 +3565,7 @@ msgstr "Adakah anda hendak membuang ikon ini daripada bar alat?"
 msgid "Remember this answer"
 msgstr "Format imej ini"
 
-#: ../bin/net_monitor:60
-#: ../bin/net_monitor:65
+#: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, fuzzy, c-format
 msgid "Network Monitoring"
 msgstr "Aplet pengawas rangkaian"
@@ -3783,9 +3592,7 @@ msgid ""
 "speed:"
 msgstr "Menghantar stat..."
 
-#: ../bin/net_monitor:105
-#: ../bin/net_monitor:106
-#: ../bin/net_monitor:111
+#: ../bin/net_monitor:105 ../bin/net_monitor:106 ../bin/net_monitor:111
 #, c-format
 msgid "unknown"
 msgstr "tidak diketahui"
@@ -3814,14 +3621,12 @@ msgstr ""
 msgid "Wait please, testing your connection..."
 msgstr "Mengaktifkan sambungan IPsec %s, sila tunggu..."
 
-#: ../bin/net_monitor:185
-#: ../bin/net_monitor:198
+#: ../bin/net_monitor:185 ../bin/net_monitor:198
 #, fuzzy, c-format
 msgid "Disconnecting from Internet "
 msgstr "Internet Asas-teks"
 
-#: ../bin/net_monitor:185
-#: ../bin/net_monitor:198
+#: ../bin/net_monitor:185 ../bin/net_monitor:198
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Menyambung ke Internet"
@@ -3853,14 +3658,12 @@ msgstr "dalam."
 msgid "Color configuration"
 msgstr "Tetapan KFish"
 
-#: ../bin/net_monitor:395
-#: ../bin/net_monitor:407
+#: ../bin/net_monitor:395 ../bin/net_monitor:407
 #, c-format
 msgid "sent: "
 msgstr "dihantar:"
 
-#: ../bin/net_monitor:398
-#: ../bin/net_monitor:411
+#: ../bin/net_monitor:398 ../bin/net_monitor:411
 #, c-format
 msgid "received: "
 msgstr "diterima:"
@@ -3877,7 +3680,9 @@ msgstr "Layari Rangkaian Tempatan"
 
 #: ../bin/net_monitor:461
 #, fuzzy, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
 msgstr "Amaran"
 
 #: ../bin/net_monitor:472
@@ -3905,12 +3710,9 @@ msgstr "Tetapan Semasa"
 msgid "Address settings"
 msgstr "Tetapan Semasa"
 
-#: ../lib/network/connection.pm:172
-#: ../lib/network/connection/cable.pm:44
-#: ../lib/network/connection/wireless.pm:43
-#: ../lib/network/vpn/openvpn.pm:127
-#: ../lib/network/vpn/openvpn.pm:171
-#: ../lib/network/vpn/openvpn.pm:339
+#: ../lib/network/connection.pm:172 ../lib/network/connection/cable.pm:44
+#: ../lib/network/connection/wireless.pm:43 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "Tiada"
@@ -3930,8 +3732,7 @@ msgstr ""
 msgid "Link detected on interface %s"
 msgstr "Semua permintaan pada port:"
 
-#: ../lib/network/connection.pm:252
-#: ../lib/network/connection/ethernet.pm:274
+#: ../lib/network/connection.pm:252 ../lib/network/connection/ethernet.pm:274
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr ""
@@ -4029,8 +3830,7 @@ msgstr ""
 msgid "Unable to find network interface for selected device (using %s driver)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:61
-#: ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, fuzzy, c-format
 msgid "Manual configuration"
 msgstr "Tetapan KFish"
@@ -4051,7 +3851,9 @@ msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
-msgstr "Sila masukkan konfigurasi IP bagi mesin ini. Setiap item patut dimasukkan sebagai alamat IP pada notasi desimal-berdot (sebagai contoh, 1.2.3.4)."
+msgstr ""
+"Sila masukkan konfigurasi IP bagi mesin ini. Setiap item patut dimasukkan "
+"sebagai alamat IP pada notasi desimal-berdot (sebagai contoh, 1.2.3.4)."
 
 #: ../lib/network/connection/ethernet.pm:138
 #, fuzzy, c-format
@@ -4118,37 +3920,30 @@ msgstr ""
 msgid "ISDN"
 msgstr "Telefon ISDN"
 
-#: ../lib/network/connection/isdn.pm:153
-#: ../lib/network/netconnect.pm:197
-#: ../lib/network/netconnect.pm:200
-#: ../lib/network/netconnect.pm:218
-#: ../lib/network/netconnect.pm:471
-#: ../lib/network/netconnect.pm:567
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:197
+#: ../lib/network/netconnect.pm:200 ../lib/network/netconnect.pm:218
+#: ../lib/network/netconnect.pm:471 ../lib/network/netconnect.pm:567
 #: ../lib/network/netconnect.pm:570
 #, fuzzy, c-format
 msgid "Unlisted - edit manually"
 msgstr "Sunting Persamaan Latex"
 
-#: ../lib/network/connection/isdn.pm:196
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:403
 #, fuzzy, c-format
 msgid "I do not know"
 msgstr "Fail %s tidak dijumpai"
 
-#: ../lib/network/connection/isdn.pm:197
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -4502,15 +4297,21 @@ msgstr "Mod terhad"
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197
-#: ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
+#, c-format
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
 msgstr ""
 
 #: ../lib/network/connection/wireless.pm:322
@@ -4553,14 +4354,68 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "M-x nxml-mode"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Masukkan nama logmasuk untuk akaun ini."
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Katalaluan"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nama Medan"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
-"RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
-"channel is clear. This adds overhead, but increase performance in case of hidden\n"
+"RTS/CTS adds a handshake before each packet transmission to make sure that "
+"the\n"
+"channel is clear. This adds overhead, but increase performance in case of "
+"hidden\n"
 "nodes or large number of active nodes. This parameter sets the size of the\n"
 "smallest packet for which the node sends RTS, a value equal to the maximum\n"
-"packet size disable the scheme. You may also set this parameter to auto, fixed\n"
+"packet size disable the scheme. You may also set this parameter to auto, "
+"fixed\n"
 "or off."
 msgstr ""
 
@@ -4568,7 +4423,8 @@ msgstr ""
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set as the hostname).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
+"as the hostname).\n"
 "\n"
 "See iwconfig(8) man page for further information."
 msgstr ""
@@ -4588,31 +4444,213 @@ msgstr ""
 #: ../lib/network/connection/wireless.pm:369
 #, c-format
 msgid ""
-"iwpriv enable to set up optionals (private) parameters of a wireless network\n"
+"iwpriv enable to set up optionals (private) parameters of a wireless "
+"network\n"
 "interface.\n"
 "\n"
-"iwpriv deals with parameters and setting specific to each driver (as opposed to\n"
+"iwpriv deals with parameters and setting specific to each driver (as opposed "
+"to\n"
 "iwconfig which deals with generic ones).\n"
 "\n"
-"In theory, the documentation of each device driver should indicate how to use\n"
+"In theory, the documentation of each device driver should indicate how to "
+"use\n"
 "those interface specific commands and their effect.\n"
 "\n"
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-kesan kemera"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mod"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Jenis per&nomboran:"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, fuzzy, c-format
 msgid "An encryption key is required."
 msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
 
 #: ../lib/network/connection/wireless.pm:393
 #, 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)."
+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:399
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
+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:411
@@ -4635,8 +4673,7 @@ msgstr ""
 msgid "DSL"
 msgstr "SSL"
 
-#: ../lib/network/connection/xdsl.pm:76
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:763
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr ""
@@ -4644,14 +4681,17 @@ msgstr ""
 #: ../lib/network/connection/xdsl.pm:104
 #, c-format
 msgid ""
-"The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n"
+"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
+"problem.\n"
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
 #: ../lib/network/connection/xdsl.pm:164
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
 msgstr ""
 
 #: ../lib/network/connection/xdsl.pm:184
@@ -4695,10 +4735,8 @@ msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
 #: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:41
-#: ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:131
-#: ../lib/network/thirdparty.pm:115
+#: ../lib/network/connection_manager.pm:41 ../lib/network/drakvpn.pm:45
+#: ../lib/network/netconnect.pm:131 ../lib/network/thirdparty.pm:115
 #, fuzzy, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "Tak dapat membuka fail %s."
@@ -4715,8 +4753,7 @@ msgstr "Tetapan Semasa"
 msgid "Please enter settings for network"
 msgstr "Sila masukkan tetapan rangkaian tempatan anda:"
 
-#: ../lib/network/connection_manager.pm:58
-#: ../lib/network/netconnect.pm:177
+#: ../lib/network/connection_manager.pm:58 ../lib/network/netconnect.pm:177
 #, fuzzy, c-format
 msgid "Configuring device..."
 msgstr "Peranti Blok"
@@ -4746,20 +4783,17 @@ msgstr "Penggunaan: killproc {program} [isyarat]"
 msgid "Encryption"
 msgstr "Enkripsi:"
 
-#: ../lib/network/connection_manager.pm:244
-#: ../lib/network/netconnect.pm:209
+#: ../lib/network/connection_manager.pm:244 ../lib/network/netconnect.pm:209
 #, fuzzy, c-format
 msgid "Scanning for networks..."
 msgstr "Cari rangkaian tanpawayar"
 
-#: ../lib/network/connection_manager.pm:281
-#: ../lib/network/drakroam.pm:111
+#: ../lib/network/connection_manager.pm:281 ../lib/network/drakroam.pm:111
 #, fuzzy, c-format
 msgid "Disconnect"
 msgstr "Putus"
 
-#: ../lib/network/connection_manager.pm:281
-#: ../lib/network/drakroam.pm:110
+#: ../lib/network/connection_manager.pm:281 ../lib/network/drakroam.pm:110
 #, c-format
 msgid "Connect"
 msgstr "Sambung"
@@ -4824,8 +4858,7 @@ msgstr "BitTorrent"
 msgid "Port scan detection"
 msgstr "Program Imbas & OCR"
 
-#: ../lib/network/drakfirewall.pm:166
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
 #, fuzzy, c-format
 msgid "Firewall configuration"
 msgstr "Tetapan KFish"
@@ -4854,8 +4887,7 @@ msgstr "Rangkaian Internet."
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "Internet?"
 
-#: ../lib/network/drakfirewall.pm:190
-#: ../lib/network/shorewall.pm:145
+#: ../lib/network/drakfirewall.pm:190 ../lib/network/shorewall.pm:145
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
@@ -4896,7 +4928,8 @@ msgstr ""
 #: ../lib/network/drakfirewall.pm:256
 #, c-format
 msgid ""
-"You can be warned when someone accesses to a service or tries to intrude into your computer.\n"
+"You can be warned when someone accesses to a service or tries to intrude "
+"into your computer.\n"
 "Please select which network activities should be watched."
 msgstr ""
 
@@ -4915,20 +4948,17 @@ msgstr "Tiada peranti dijumpai"
 msgid "Hostname changed to \"%s\""
 msgstr "&Lompat ke hiperlink"
 
-#: ../lib/network/drakroam.pm:109
-#: ../lib/network/netcenter.pm:72
+#: ../lib/network/drakroam.pm:109 ../lib/network/netcenter.pm:72
 #, c-format
 msgid "Configure"
 msgstr "Buat konfigurasi"
 
-#: ../lib/network/drakroam.pm:112
-#: ../lib/network/netcenter.pm:77
+#: ../lib/network/drakroam.pm:112 ../lib/network/netcenter.pm:77
 #, c-format
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: ../lib/network/drakroam.pm:123
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/drakroam.pm:123 ../lib/network/netconnect.pm:769
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "Sambungan Gagal"
@@ -4983,8 +5013,7 @@ msgstr "Sila masukkan direktori pelayan HTTP."
 msgid "Please enter the settings of your VPN connection"
 msgstr "Sila masukkan tetapan rangkaian tempatan anda:"
 
-#: ../lib/network/drakvpn.pm:94
-#: ../lib/network/netconnect.pm:299
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:299
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr ""
@@ -4999,8 +5028,10 @@ msgstr "Sambungan Gagal"
 msgid ""
 "The VPN connection is now configured.\n"
 "\n"
-"This VPN connection can be automatically started together with a network connection.\n"
-"It can be done by reconfiguring the network connection and selecting this VPN connection.\n"
+"This VPN connection can be automatically started together with a network "
+"connection.\n"
+"It can be done by reconfiguring the network connection and selecting this "
+"VPN connection.\n"
 msgstr ""
 
 #: ../lib/network/ifw.pm:129
@@ -5045,7 +5076,9 @@ msgstr "Peristiwa ini telah diubah."
 
 #: ../lib/network/ifw.pm:146
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
 msgstr ""
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
@@ -5054,28 +5087,19 @@ msgstr ""
 msgid "port %d"
 msgstr "Port"
 
-#: ../lib/network/modem.pm:42
-#: ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44
-#: ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:611
+#: ../lib/network/netconnect.pm:628 ../lib/network/netconnect.pm:644
 #, c-format
 msgid "Manual"
 msgstr "Manual"
 
-#: ../lib/network/modem.pm:42
-#: ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44
-#: ../lib/network/modem.pm:63
-#: ../lib/network/modem.pm:76
-#: ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110
-#: ../lib/network/netconnect.pm:606
-#: ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:623
-#: ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
+#: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
+#: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:606
+#: ../lib/network/netconnect.pm:611 ../lib/network/netconnect.pm:623
+#: ../lib/network/netconnect.pm:628 ../lib/network/netconnect.pm:644
 #: ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Automatic"
@@ -5096,19 +5120,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Tidak dapat menjumpai imej pemasangan %s"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, fuzzy, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Gagal memuatkan modul: isicom"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, fuzzy, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Gagal memuatkan modul: isicom"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, fuzzy, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Tidak dapat menjumpai imej pemasangan %s"
@@ -5138,8 +5162,7 @@ msgstr "Peranti Blok"
 msgid "Network Center"
 msgstr "Tab Tengah"
 
-#: ../lib/network/netcenter.pm:62
-#: ../lib/network/netconnect.pm:212
+#: ../lib/network/netcenter.pm:62 ../lib/network/netconnect.pm:212
 #, fuzzy, c-format
 msgid "Please select your network:"
 msgstr "Pilih aplikasi default anda"
@@ -5156,8 +5179,7 @@ msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
 msgid "United States"
 msgstr "Amerika Syarikat"
 
-#: ../lib/network/netconnect.pm:60
-#: ../lib/network/netconnect.pm:501
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:501
 #: ../lib/network/netconnect.pm:515
 #, fuzzy, c-format
 msgid "Manual choice"
@@ -5178,8 +5200,7 @@ msgstr "Pilih protokol untuk pemasangan:"
 msgid "Choose the connection you want to configure"
 msgstr "Apa yang anda ingin konfigurasikan?"
 
-#: ../lib/network/netconnect.pm:145
-#: ../lib/network/netconnect.pm:356
+#: ../lib/network/netconnect.pm:145 ../lib/network/netconnect.pm:356
 #: ../lib/network/netconnect.pm:796
 #, fuzzy, c-format
 msgid "Select the network interface to configure:"
@@ -5207,8 +5228,7 @@ msgid ""
 "If you do not know it, keep the preselected protocol."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:293
-#: ../lib/network/netconnect.pm:663
+#: ../lib/network/netconnect.pm:293 ../lib/network/netconnect.pm:663
 #, fuzzy, c-format
 msgid "Connection control"
 msgstr "Pusat Kawalan"
@@ -5248,8 +5268,7 @@ msgstr "Pelayan Nama DNS"
 msgid "Card IO_1"
 msgstr "Port IO"
 
-#: ../lib/network/netconnect.pm:359
-#: ../lib/network/netconnect.pm:364
+#: ../lib/network/netconnect.pm:359 ../lib/network/netconnect.pm:364
 #, fuzzy, c-format
 msgid "External ISDN modem"
 msgstr "Tetapan Dialup Modem"
@@ -5259,10 +5278,8 @@ msgstr "Tetapan Dialup Modem"
 msgid "Select a device!"
 msgstr "Peranti Blok"
 
-#: ../lib/network/netconnect.pm:401
-#: ../lib/network/netconnect.pm:411
-#: ../lib/network/netconnect.pm:421
-#: ../lib/network/netconnect.pm:454
+#: ../lib/network/netconnect.pm:401 ../lib/network/netconnect.pm:411
+#: ../lib/network/netconnect.pm:421 ../lib/network/netconnect.pm:454
 #: ../lib/network/netconnect.pm:468
 #, fuzzy, c-format
 msgid "ISDN Configuration"
@@ -5279,7 +5296,8 @@ msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
 msgstr "on dan"
 
 #: ../lib/network/netconnect.pm:416
@@ -5299,7 +5317,10 @@ msgstr ""
 
 #: ../lib/network/netconnect.pm:440
 #, c-format
-msgid "A CAPI driver is available for this modem. This CAPI driver can offer more capabilities than the free driver (like sending faxes). Which driver do you want to use?"
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
 msgstr ""
 
 #: ../lib/network/netconnect.pm:454
@@ -5314,8 +5335,7 @@ msgid ""
 "If it is not listed, choose Unlisted."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:470
-#: ../lib/network/netconnect.pm:566
+#: ../lib/network/netconnect.pm:470 ../lib/network/netconnect.pm:566
 #, fuzzy, c-format
 msgid "Provider:"
 msgstr "Nama penyedia:"
@@ -5367,8 +5387,7 @@ msgstr "Jumlah Lajur"
 msgid "Login ID"
 msgstr "Id Bina."
 
-#: ../lib/network/netconnect.pm:608
-#: ../lib/network/netconnect.pm:641
+#: ../lib/network/netconnect.pm:608 ../lib/network/netconnect.pm:641
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Sokongan Rangkaian Dailup"
@@ -5459,14 +5478,17 @@ msgstr "Tahniah dan Internet"
 
 #: ../lib/network/netconnect.pm:751
 #, fuzzy, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
 msgstr "siap ulanghidup."
 
 #: ../lib/network/netconnect.pm:752
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration."
+"Test your connection via net_monitor or mcc. If your connection does not "
+"work, you might want to relaunch the configuration."
 msgstr ""
 
 #: ../lib/network/netconnect.pm:764
@@ -5474,8 +5496,7 @@ msgstr ""
 msgid "Sagem USB modem"
 msgstr "Tetapan Dialup Modem"
 
-#: ../lib/network/netconnect.pm:765
-#: ../lib/network/netconnect.pm:766
+#: ../lib/network/netconnect.pm:765 ../lib/network/netconnect.pm:766
 #, fuzzy, c-format
 msgid "Bewan modem"
 msgstr "Rentetan init Modem"
@@ -5563,8 +5584,10 @@ msgstr ""
 #: ../lib/network/netconnect.pm:787
 #, fuzzy, c-format
 msgid ""
-"Because you are doing a network installation, your network is already configured.\n"
-"Click on Ok to keep your configuration, or cancel to reconfigure your Internet & Network connection.\n"
+"Because you are doing a network installation, your network is already "
+"configured.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
 msgstr "on Ok Internet Rangkaian"
 
 #: ../lib/network/netconnect.pm:790
@@ -5614,7 +5637,9 @@ msgstr "Tidak dapat mengkonfigurasikan peranti rangkaian %s"
 
 #: ../lib/network/netconnect.pm:798
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
 msgstr ""
 
 #: ../lib/network/netconnect.pm:799
@@ -5655,7 +5680,9 @@ msgstr "Tetapan KFish"
 
 #: ../lib/network/network.pm:430
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
 msgstr ""
 
 #: ../lib/network/network.pm:431
@@ -5739,7 +5766,9 @@ msgstr ""
 
 #: ../lib/network/thirdparty.pm:138
 #, c-format
-msgid "These packages can be found in Mandriva Club or in Mandriva commercial releases."
+msgid ""
+"These packages can be found in Mandriva Club or in Mandriva commercial "
+"releases."
 msgstr ""
 
 #: ../lib/network/thirdparty.pm:139
@@ -5754,14 +5783,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178
-#: ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Pengformat Liut"
 
-#: ../lib/network/thirdparty.pm:179
-#: ../lib/network/thirdparty.pm:186
+#: ../lib/network/thirdparty.pm:179 ../lib/network/thirdparty.pm:186
 #, fuzzy, c-format
 msgid "Use my Windows partition"
 msgstr "Guna partisyen sedia ada (onpart)"
@@ -5793,7 +5825,9 @@ msgstr "Masukkan cakera liut"
 
 #: ../lib/network/thirdparty.pm:228
 #, fuzzy, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
 msgstr "dalam"
 
 #: ../lib/network/thirdparty.pm:228
@@ -5952,3 +5986,6 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Failed to add printers."
+#~ msgstr "Gagal untuk mencari seksyen: %s"
diff --git a/po/mt.po b/po/mt.po
index f71fd24..766df2d 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-10-04 18:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -2034,12 +2034,7 @@ msgstr "Prosit"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2415,12 +2410,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2485,7 +2475,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4498,12 +4500,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4550,7 +4557,58 @@ msgstr "Awto:"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Login tal-kont (user name)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Password"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Isem iċ-ċertifikat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4635,7 +4693,182 @@ msgstr ""
 "\n"
 "Ara l-paġna ta' man għal iwpriv(8) għal iżjed tagħrif."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Għarfien awtomatiku"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modalità"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Tip ta' ċertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5146,19 +5379,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5857,7 +6090,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Uża flopi"
diff --git a/po/nb.po b/po/nb.po
index f3e5719..7606b3a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-12-15 15:07+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -2115,12 +2115,7 @@ msgstr "Gratulerer"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Veivisseren la vellykket til det delte Samba-området"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Klarte ikke å legge til skrivere."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2500,12 +2495,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Veivisseren la vellykket til det delte Samba-området"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Klarte ikke å endre på delt Samba-ressurs."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2570,7 +2560,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba-brukere"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Klarte ikke å endre på delt Samba-ressurs."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba håndterer håndterer delte Samba-ressurser"
@@ -4768,12 +4770,17 @@ msgstr "Lukket WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA forhåndsdelt nøkkel"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Fastvarefiler trengs for denne enheten."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4822,7 +4829,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Innloggingskonto (brukernavn)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Passord"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Navn på sertifikatet"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4912,7 +4970,182 @@ msgstr ""
 "\n"
 "Se iwpriv(8) man-side for ytterligere informasjon."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatisk oppdagelse"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modus"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Sertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "En krypteringsnøkkel kreves"
@@ -5437,12 +5670,7 @@ msgstr "Velg Windows-driveren (.inf-fil)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Klarte ikke å installere ndiswrapper-driveren for %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Klarte ikke å laste ndiswrapper-modulen!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5451,7 +5679,12 @@ msgstr ""
 "Den valgte enheten har allerede blitt sett opp med %s-driveren.\n"
 "Ønsker du virkelig å bruke en ndiswrapper-driver?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Klarte ikke å laste ndiswrapper-modulen!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Klarte ikke å finne ndiswrapper-grensesnitt!"
@@ -6166,7 +6399,12 @@ msgstr ""
 "Filene som trengs kan også installeres fra denne internettadressen:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Fastvarefiler trengs for denne enheten."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Bruk en diskett"
@@ -6365,3 +6603,6 @@ msgstr "Bruk Cisco-UDP innkapsling"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Bruk spesifikk UDP-port"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Klarte ikke å legge til skrivere."
diff --git a/po/nl.po b/po/nl.po
index b386de4..c7ec77c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-nl\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-25 22:42+0200\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team:  Dutch <vertaling@vrijschrift.org>\n"
@@ -2116,12 +2116,7 @@ msgstr "Gefeliciteerd"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "De wizard heeft de gedeelde Samba-map met succes toegevoegd."
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Printers toevoegen mislukt."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2501,12 +2496,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "De wizard heeft de gedeelde Samba-map met succes toegevoegd."
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Samba gedeelde map wijzigen mislukt."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2571,7 +2561,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba gebruikers"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Samba gedeelde map wijzigen mislukt."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba houdt Samba gedeelde mappen bij"
@@ -4770,12 +4772,17 @@ msgstr "Beperkte WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA vooraf gedeelde sleutel"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Firmware-bestanden zijn vereist voor dit apparaat."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4828,7 +4835,58 @@ msgstr "Automatisch"
 msgid "Encryption mode"
 msgstr "Versleutelingsmodus"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Account-aanmelding (gebruikersnaam)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Wachtwoord"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Naam van het certificaat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4916,7 +4974,182 @@ msgstr ""
 "\n"
 "Zie de iwpriv(8) man-pagina voor meer informatie."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatisch bespeuren"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modus"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificaat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Een encryptie-sleutel is verplicht."
@@ -5442,12 +5675,7 @@ msgstr "Selecteer het Windows-stuurprogramma (.inf-bestand)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Niet in staat het %s-ndiswrapper-stuurprogramma te installeren!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Niet in staat de ndiswrapper-module in te laden!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5456,7 +5684,12 @@ msgstr ""
 "Het geselecteerde apparaat is al geconfigureerd met het %s-stuurprogramma.\n"
 "Wilt u echt een ndiswrapper-stuurprogramma gebruiken?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Niet in staat de ndiswrapper-module in te laden!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Kan de ndiswrapper-interface niet vinden!"
@@ -6174,7 +6407,12 @@ msgstr ""
 "De benodigde bestanden kunnen ook geïnstalleerd worden vanaf deze URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Firmware-bestanden zijn vereist voor dit apparaat."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Een diskette gebruiken"
@@ -6375,5 +6613,8 @@ msgstr "Cisco-UDP encapsulatie gebruiken"
 msgid "Use specific UDP port"
 msgstr "Specifieke UDP-poort gebruiken"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Printers toevoegen mislukt."
+
 #~ msgid "Get Online Help"
 #~ msgstr "On-line hulp opzoeken"
diff --git a/po/nn.po b/po/nn.po
index 157eac0..2bf7e6f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-02 21:02+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -542,7 +542,8 @@ msgstr "Portnaradressa skal vera på formatet «1.2.3.4»."
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
-msgstr "Fann ikkje noko nettverkskort. Prøv å køyra maskinvareoppsettverktøyet."
+msgstr ""
+"Fann ikkje noko nettverkskort. Prøv å køyra maskinvareoppsettverktøyet."
 
 #: ../bin/drakconnect:714
 #, c-format
@@ -573,7 +574,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Nettverksgrensesnittet «%s» er no fjerna."
 
 #: ../bin/drakconnect:769
@@ -1314,7 +1316,8 @@ msgstr "Ny profil ..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Namn på den nye profilen (denne blir laga som ein kopi av gjeldande profil):"
+msgstr ""
+"Namn på den nye profilen (denne blir laga som ein kopi av gjeldande profil):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -2058,8 +2061,10 @@ msgstr "Legg til spesiell delt skrivarresurs"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Denne vegvisaren gjer det lett å laga spesielle delte Samba-skrivarresursar."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Denne vegvisaren gjer det lett å laga spesielle delte Samba-skrivarresursar."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -2081,12 +2086,7 @@ msgstr "Gratulerer"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Vegvisaren har no lagt til den delete skrivarresursen"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Klarte ikkje leggja til skrivarar."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2166,7 +2166,8 @@ msgstr "DrakSamba-oppføring"
 #: ../bin/draksambashare:705
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Du må leggja til eller velja ein delt Samba-resurs for å kunna endra han."
+msgstr ""
+"Du må leggja til eller velja ein delt Samba-resurs for å kunna endra han."
 
 #: ../bin/draksambashare:728
 #, c-format
@@ -2200,7 +2201,8 @@ msgstr "Offentleg:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Opprettingsmaske, opprettingsmodus og mappemaska må vera numerisk. Eksempel: "
 "0755."
@@ -2255,7 +2257,9 @@ msgstr "Vegvisar for Samba-oppsett"
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
-msgstr "Samba lèt tenaren fungera som fil- og utskriftstenarar for arbeidsstasjonar som ikkje køyrer Linux."
+msgstr ""
+"Samba lèt tenaren fungera som fil- og utskriftstenarar for arbeidsstasjonar "
+"som ikkje køyrer Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2267,19 +2271,25 @@ msgstr "PDC-tenar: hovuddomenekontrollar"
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
-msgstr "Tenarar sett opp som PDC er ansvarleg for Windows-autentisering på heile domenet."
+msgstr ""
+"Tenarar sett opp som PDC er ansvarleg for Windows-autentisering på heile "
+"domenet."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Éintenarinstallasjonar kan bruka smbpasswd- eller tdbsam-passordmotorane."
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Éintenarinstallasjonar kan bruka smbpasswd- eller tdbsam-passordmotorane."
 
 #: ../bin/draksambashare:1082
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
-msgstr "«Domain master = yes» får tenaren til å registrera NetBIOS-namnet <pdc name>. Dette namnet vert attkjend av andre tenarar."
+msgstr ""
+"«Domain master = yes» får tenaren til å registrera NetBIOS-namnet <pdc name>. "
+"Dette namnet vert attkjend av andre tenarar."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2309,7 +2319,11 @@ msgid ""
 "win an election and become the master browser, you can set the level above "
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
-msgstr "Det globale OS-nivåvalet fastset operativsystemnivået som Samba skal maskera som ved tenarval. Viss du ønskjer at Samba skal vinna valet og verta hovudtenaren, kan du setja nivået høgare enn operativsystemet på nettverket med den høgaste verdien, for eksempel nivå 34."
+msgstr ""
+"Det globale OS-nivåvalet fastset operativsystemnivået som Samba skal maskera "
+"som ved tenarval. Viss du ønskjer at Samba skal vinna valet og verta "
+"hovudtenaren, kan du setja nivået høgare enn operativsystemet på nettverket "
+"med den høgaste verdien, for eksempel nivå 34."
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2351,7 +2365,9 @@ msgstr "Tryggleiksmodus"
 msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
-msgstr "Brukarnivå: Klienten sender ein førespurnad om øktoppsett rett etter protokollforhandlinga. Førespurnaden inneheld brukarnamn og passord."
+msgstr ""
+"Brukarnivå: Klienten sender ein førespurnad om øktoppsett rett etter "
+"protokollforhandlinga. Førespurnaden inneheld brukarnamn og passord."
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2364,7 +2380,9 @@ msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
 "in a central, shared, account repository. The centralized account repository "
 "is shared between domain (security) controllers."
-msgstr "Domenenivå: Ein måte å lagra alle brukar- og gruppekontoar i eit sentral, delt kontolager. Dette lageret vert delt mellom domenekontrollarane."
+msgstr ""
+"Domenenivå: Ein måte å lagra alle brukar- og gruppekontoar i eit sentral, "
+"delt kontolager. Dette lageret vert delt mellom domenekontrollarane."
 
 #: ../bin/draksambashare:1142
 #, c-format
@@ -2381,7 +2399,8 @@ msgstr "Tenarbanner."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Banneren definerer korleis tenaren vert skilda på Windows-arbeidsstasjonar."
+msgstr ""
+"Banneren definerer korleis tenaren vert skilda på Windows-arbeidsstasjonar."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2403,17 +2422,21 @@ msgstr "Samba-logg"
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr "Loggfil: Bruk «fil.%m» for å bruka forskjellig logg for kvar maskina som koplar seg til."
+msgstr ""
+"Loggfil: Bruk «fil.%m» for å bruka forskjellig logg for kvar maskina som "
+"koplar seg til."
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Loggingsnivå: Definerer kor detaljert loggføringa skal vera (frå 0 til 10)."
+msgstr ""
+"Loggingsnivå: Definerer kor detaljert loggføringa skal vera (frå 0 til 10)."
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Største loggstorleik: Set ei grense på storleiken til loggfilene (i Kb)."
+msgstr ""
+"Største loggstorleik: Set ei grense på storleiken til loggfilene (i Kb)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2440,14 +2463,18 @@ msgstr "Tenaren samla inn følgjande parametrar for oppsett av Samba."
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
-msgstr "Trykk «Neste» for å godta verdiane og setja opp tenaren, eller «Tilbake» for å gjera endringar."
+msgstr ""
+"Trykk «Neste» for å godta verdiane og setja opp tenaren, eller «Tilbake» for å "
+"gjera endringar."
 
 #: ../bin/draksambashare:1177
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Viss du tidlegare har laga delte område, vert desse viste i dette oppsettet. Køyr «drakwizard sambashare» for å handtera delte område."
+msgstr ""
+"Viss du tidlegare har laga delte område, vert desse viste i dette oppsettet. "
+"Køyr «drakwizard sambashare» for å handtera delte område."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2464,12 +2491,7 @@ msgstr "Tenarbanner:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Vegvisaren har no sett opp Samba-tenaren."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Klarte ikkje setja opp Samba-tenaren."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Uventa feil ved oppsett av Samba:"
@@ -2534,7 +2556,19 @@ msgstr "Brukaroppsett"
 msgid "Samba Users"
 msgstr "Samba-brukarar"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Klarte ikkje setja opp Samba-tenaren."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba handter delete Samba-resursar"
@@ -4244,7 +4278,8 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:53
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Klarte ikkje finna nettverksgrensesnitt for vald eining (med drivaren «%s»)."
+msgstr ""
+"Klarte ikkje finna nettverksgrensesnitt for vald eining (med drivaren «%s»)."
 
 #: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, c-format
@@ -4715,17 +4750,23 @@ msgstr "Avgrensa WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Førehandsdelt nøkkel"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Du treng fastvarefiler for denne eininga."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
-msgstr "Trådlauskortet er sett ut av bruk. Slå på trådlausbrytaren (RF kill switch)."
+msgstr ""
+"Trådlauskortet er sett ut av bruk. Slå på trådlausbrytaren (RF kill switch)."
 
 #: ../lib/network/connection/wireless.pm:322
 #, c-format
@@ -4767,7 +4808,58 @@ msgstr "Automatisk"
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Brukarnamn til konto"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Passord"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nam på sertifikatet"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4854,7 +4946,182 @@ msgstr ""
 "\n"
 "Sjå manualsida iwpriv(8) for meir informasjon."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Finn automatisk"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modus"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Sertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Det trengst ein krypteringsnøkkel."
@@ -5331,7 +5598,8 @@ msgstr "Eit «%s»-åtak vart forsøkt av «%s»."
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
-msgstr "Programmet «%s» prøver å gjera ei teneste (%s) tilgjengeleg til nettverket."
+msgstr ""
+"Programmet «%s» prøver å gjera ei teneste (%s) tilgjengeleg til nettverket."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:150
@@ -5372,12 +5640,7 @@ msgstr "Vel Windows-drivarfila (ei .inf-fil)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Klarte ikkje installera ndiswrapper-drivaren til «%s»."
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Klarte ikkje lasta ndiswrapper-modulen."
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5386,7 +5649,12 @@ msgstr ""
 "Eininga er allereie sett opp med drivaren «%s».\n"
 "Er du sikker på at du vil bruka ndiswrapper-drivaren?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Klarte ikkje lasta ndiswrapper-modulen."
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Klarte ikkje finna ndiswrapper-grensesnittet."
@@ -5986,7 +6254,8 @@ msgstr "Mellomtenaroppsett"
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
-msgstr "Her kan du setja opp mellomtenarar (eksempel: http://min_mellomtenar:8080)"
+msgstr ""
+"Her kan du setja opp mellomtenarar (eksempel: http://min_mellomtenar:8080)"
 
 #: ../lib/network/network.pm:431
 #, c-format
@@ -6083,7 +6352,8 @@ msgstr "Nokre pakkar («%s») trengst, men er ikkje tilgjengelege."
 msgid ""
 "These packages can be found in Mandriva Club or in Mandriva commercial "
 "releases."
-msgstr "Desse pakkane finn du i Mandriva Club, og i kommersielle Mandriva-utgåver."
+msgstr ""
+"Desse pakkane finn du i Mandriva Club, og i kommersielle Mandriva-utgåver."
 
 #: ../lib/network/thirdparty.pm:139
 #, c-format
@@ -6099,7 +6369,12 @@ msgstr ""
 "Dei nødvendige filene finn du òg på denne adressa:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Du treng fastvarefiler for denne eininga."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Bruk diskett"
@@ -6299,6 +6574,8 @@ msgstr "Bruk Cisco-UDP-innkapsling"
 msgid "Use specific UDP port"
 msgstr "Bruk vald UDP-port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Klarte ikkje leggja til skrivarar."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Få hjelp på nettet"
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 158300e..19860c5 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-03-27 17:55+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -2020,12 +2020,7 @@ msgstr "ਮੁਬਾਰਕਾਂ"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2401,12 +2396,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2471,7 +2461,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4505,12 +4507,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4557,7 +4564,58 @@ msgstr "ਸਵੈ"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "ਖਾਤਾ ਲਾਗਇਨ (ਉਪਭੋਗੀ ਨਾਂ)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "ਗੁਪਤ-ਕੋਡ"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "ਸਾਰਟੀਫਿਕੇਟ ਦਾ ਨਾਂ"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4623,7 +4681,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "ਪ੍ਰੋਟੋਕਾਲ"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "ਸਵੈ-ਖੋਜ"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "ਵਿਧੀ"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "ਸਾਰਟੀਫਿਕੇਟ ਕਿਸਮ"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5133,19 +5366,19 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ Windows ਡਰਾਈਵਰ (.inf ਫਾਇ�
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5837,7 +6070,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "ਫਲਾਪੀ ਵਰਤੋ"
diff --git a/po/pl.po b/po/pl.po
index c481964..2ce78b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,9 +15,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-03-03 12:12+0100\n"
-"Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>\n"
+"Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva."
+"pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -550,7 +551,8 @@ msgstr "Adres IP bramy powinien być w formacie typu 1.2.3.4"
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
-msgstr "Nie wykryto w systemie karty sieciowej. Uruchom program konfiguracji sprzętu."
+msgstr ""
+"Nie wykryto w systemie karty sieciowej. Uruchom program konfiguracji sprzętu."
 
 #: ../bin/drakconnect:714
 #, c-format
@@ -581,7 +583,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Gratulacje, interfejs sieciowy \"%s\" został pomyślnie usunięty"
 
 #: ../bin/drakconnect:769
@@ -846,7 +849,8 @@ msgstr "Wewnętrzna nazwa domeny"
 #: ../bin/drakgw:184
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "W bieżącej konfiguracji wykryto możliwy konflikt adresów sieciowych: %s!\n"
+msgstr ""
+"W bieżącej konfiguracji wykryto możliwy konflikt adresów sieciowych: %s!\n"
 
 #: ../bin/drakgw:200
 #, c-format
@@ -1329,7 +1333,8 @@ msgstr "Nowy profil..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Nazwa tworzonego profilu (nowy profil jest tworzony jako kopia aktualnego):"
+msgstr ""
+"Nazwa tworzonego profilu (nowy profil jest tworzony jako kopia aktualnego):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -1766,7 +1771,8 @@ msgstr "Usunięcie udziału NFS nie powiodło się."
 #: ../bin/drakproxy:36
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Należy wylogować się a następnie zalogować ponownie aby zmiany odniosły efekt"
+msgstr ""
+"Należy wylogować się a następnie zalogować ponownie aby zmiany odniosły efekt"
 
 #: ../bin/draksambashare:64
 #, c-format
@@ -1990,7 +1996,8 @@ msgstr "Copyright (C) %s by Mandriva"
 #: ../bin/draksambashare:197
 #, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
-msgstr "Jest to proste narzędzie do łatwego zarządzania konfiguracją serwera Samba."
+msgstr ""
+"Jest to proste narzędzie do łatwego zarządzania konfiguracją serwera Samba."
 
 #: ../bin/draksambashare:199
 #, c-format
@@ -2077,7 +2084,8 @@ msgstr "Dodaj specjalną drukarkę"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Zadaniem tego druida jest łatwe tworzenie nowej specjalnej drukarki jako "
 "udziału serwera Samba."
@@ -2102,12 +2110,7 @@ msgstr "Gratulacje"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Druid dodał drukarkę do konfiguracji serwera Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Dodanie drukarek nie powiodło się."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Dodaj lub zaznacz drukarkę serwera Samba, aby ją zmodyfikować."
@@ -2219,7 +2222,8 @@ msgstr "Publiczny:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Maska tworzenia, tryb tworzenia lub maska katalogu powinna być liczbą. Np. "
 "0755."
@@ -2274,7 +2278,9 @@ msgstr "Druid konfiguracji serwera Samba"
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
-msgstr "Samba umożliwia udostępnianie plików i drukarek komputerom, które działają pod kontrolą systemów innych niż Linux."
+msgstr ""
+"Samba umożliwia udostępnianie plików i drukarek komputerom, które działają "
+"pod kontrolą systemów innych niż Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2286,19 +2292,25 @@ msgstr "Serwer PDC: główny kontroler domeny"
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
-msgstr "Serwer skonfigurowany jako PDC jest odpowiedzialny za uwierzytelnianie klientów Windows działających w domenie."
+msgstr ""
+"Serwer skonfigurowany jako PDC jest odpowiedzialny za uwierzytelnianie "
+"klientów Windows działających w domenie."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Samodzielne serwery mogą używać pliku smbpasswd lub tdbsam do obsługi haseł"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Samodzielne serwery mogą używać pliku smbpasswd lub tdbsam do obsługi haseł"
 
 #: ../bin/draksambashare:1082
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
-msgstr "Domain master = yes. Tak ustawiona opcja umożliwia zarejestrowanie nazwy NetBIOS <nazwa pdc>. Nazwa ta będzie rozpoznawana przez inne serwery."
+msgstr ""
+"Domain master = yes. Tak ustawiona opcja umożliwia zarejestrowanie nazwy "
+"NetBIOS <nazwa pdc>. Nazwa ta będzie rozpoznawana przez inne serwery."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2328,7 +2340,12 @@ msgid ""
 "win an election and become the master browser, you can set the level above "
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
-msgstr "Opcja globalna os level określa poziom systemu operacyjnego, jaki Samba wykorzysta podczas procesu wyborów przeglądarki (w sieci). Jeżeli chcesz, aby serwer Samba wygrał wybory i został główną przeglądarką (w sieci)  możesz ustawić poziom wyższy niż obecnie posiadany przez jakiś komputer w sieci, np. os level = 34"
+msgstr ""
+"Opcja globalna os level określa poziom systemu operacyjnego, jaki Samba "
+"wykorzysta podczas procesu wyborów przeglądarki (w sieci). Jeżeli chcesz, "
+"aby serwer Samba wygrał wybory i został główną przeglądarką (w sieci)  "
+"możesz ustawić poziom wyższy niż obecnie posiadany przez jakiś komputer w "
+"sieci, np. os level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2343,7 +2360,8 @@ msgstr "Grupa robocza"
 #: ../bin/draksambashare:1112
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba musi uzyskać informację jaką grupę roboczą Windows będzie obsługiwać."
+msgstr ""
+"Samba musi uzyskać informację jaką grupę roboczą Windows będzie obsługiwać."
 
 #: ../bin/draksambashare:1119 ../bin/draksambashare:1183
 #, c-format
@@ -2422,17 +2440,23 @@ msgstr "Dziennik serwera Samba"
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr "Plik dziennika: podaj plik.%m, aby skorzystać z osobnego pliku dziennika dla każdego komputera, który łączy się z serwerem"
+msgstr ""
+"Plik dziennika: podaj plik.%m, aby skorzystać z osobnego pliku dziennika dla "
+"każdego komputera, który łączy się z serwerem"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Ilość informacji: ustaw ilość informacji zbieranych w dzienniku (0 <= ilość informacji <= 10)"
+msgstr ""
+"Ilość informacji: ustaw ilość informacji zbieranych w dzienniku (0 <= ilość "
+"informacji <= 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Max. rozmiar dziennika: podaj ograniczenie dla rozmiaru plików z dziennikiem (w Kb)."
+msgstr ""
+"Max. rozmiar dziennika: podaj ograniczenie dla rozmiaru plików z dziennikiem "
+"(w Kb)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2452,21 +2476,27 @@ msgstr "Poziom logowania:"
 #: ../bin/draksambashare:1177
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "Druid zebrał następujące informacje na temat konfiguracji serwera Samba."
+msgstr ""
+"Druid zebrał następujące informacje na temat konfiguracji serwera Samba."
 
 #: ../bin/draksambashare:1177
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
-msgstr "Aby zaakceptować te wartości i skonfigurować serwer kliknij przycisk Dalej lub kliknij przycisk Wstecz, aby wprowadzić poprawki."
+msgstr ""
+"Aby zaakceptować te wartości i skonfigurować serwer kliknij przycisk Dalej "
+"lub kliknij przycisk Wstecz, aby wprowadzić poprawki."
 
 #: ../bin/draksambashare:1177
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Jeżeli już wcześniej udostępniałeś katalogi będą one uwzględnione w bieżącej konfiguracji. Uruchom program 'drakwizard sambashare', aby zarządzać udostępnionymi katalogami."
+msgstr ""
+"Jeżeli już wcześniej udostępniałeś katalogi będą one uwzględnione w bieżącej "
+"konfiguracji. Uruchom program 'drakwizard sambashare', aby zarządzać "
+"udostępnionymi katalogami."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2483,12 +2513,7 @@ msgstr "Baner serwera:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Konfiguracja serwera Samba została zakończona prawidłowo."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Konfiguracja serwera Samba nie powiodła się."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Druid konfiguracji serwera Samba nieoczekiwanie zakończył działanie:"
@@ -2553,7 +2578,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Użytkownicy serwera Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Konfiguracja serwera Samba nie powiodła się."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba służy do konfiguracji udziałów serwera Samba"
@@ -4377,7 +4414,8 @@ msgstr "Uzyskano adres sieciowy dla interfejsu %s (protokół %s)"
 #: ../lib/network/connection/ethernet.pm:278
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Uzyskanie adresu sieciowego dla interfejsu %s nie powiodło się (protokół %s)"
+msgstr ""
+"Uzyskanie adresu sieciowego dla interfejsu %s nie powiodło się (protokół %s)"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -4761,14 +4799,17 @@ msgstr "Zastrzeżony WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "Klucz WPA Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
-"Dla tego urządzenia wymagane są pliki z oprogramowaniem sprzętowym "
-"(firmware)."
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4817,7 +4858,58 @@ msgstr "Automatyczny"
 msgid "Encryption mode"
 msgstr "Tryb szyfrowania"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Konto (nazwa użytkownika)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Hasło"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nazwa certyfikatu"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4903,7 +4995,182 @@ msgstr ""
 "\n"
 "Zajrzyj na stronę manuala iwpriv(8) aby uzyskać więcej informacji."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokół"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Wykryj automatycznie"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Tryb"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certyfikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Wymagany jest klucz szyfrujący."
@@ -5425,12 +5692,7 @@ msgstr "Wybierz sterownik dla systemu Windows (plik .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Instalacja sterownika ndiswrapper dla urządzenia %s jest niemożliwa!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Załadowanie modułu ndiswrapper jest niemożliwe!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5440,7 +5702,12 @@ msgstr ""
 "s.\n"
 "Czy na pewno chcesz użyć sterownika ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Załadowanie modułu ndiswrapper jest niemożliwe!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Odszukanie interfejsu modułu ndiswrapper jest niemożliwe!"
@@ -5932,7 +6199,8 @@ msgstr ""
 #: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
-msgstr "Sieć musi zostać ponownie uruchomiona. Czy chcesz ją ponownie uruchomić ?"
+msgstr ""
+"Sieć musi zostać ponownie uruchomiona. Czy chcesz ją ponownie uruchomić ?"
 
 #: ../lib/network/netconnect.pm:791
 #, c-format
@@ -6124,7 +6392,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:135
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Niektóre z wymaganych komponentów (%s) są niedostępne dla urządzenia %s."
+msgstr ""
+"Niektóre z wymaganych komponentów (%s) są niedostępne dla urządzenia %s."
 
 #: ../lib/network/thirdparty.pm:136
 #, c-format
@@ -6154,7 +6423,14 @@ msgstr ""
 "Wymagane pliki mogą zostać zainstalowane również z tego adresu URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+"Dla tego urządzenia wymagane są pliki z oprogramowaniem sprzętowym "
+"(firmware)."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Użycie dyskietki"
@@ -6354,3 +6630,5 @@ msgstr "Użyj enkapsulacji Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Użyj określonego portu UDP"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Dodanie drukarek nie powiodło się."
diff --git a/po/pt.po b/po/pt.po
index baa9da5..c41ddf2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-03 03:47+0000\n"
 "Last-Translator: Zé <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -589,7 +589,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Parabéns, o interface de rede \"%s\" foi apagado com sucesso"
 
 #: ../bin/drakconnect:769
@@ -811,7 +812,8 @@ msgstr "Reconfigurar"
 #: ../bin/drakgw:122
 #, c-format
 msgid "Please select the network interface directly connected to the internet."
-msgstr "Por favor seleccione um interface de rede ligado directamente à internet."
+msgstr ""
+"Por favor seleccione um interface de rede ligado directamente à internet."
 
 #: ../bin/drakgw:141
 #, c-format
@@ -1338,7 +1340,8 @@ msgstr "Novo perfil..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Nome do perfil a criar (o novo perfil é criado como uma cópia do actual)"
+msgstr ""
+"Nome do perfil a criar (o novo perfil é criado como uma cópia do actual)"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -1743,7 +1746,8 @@ msgstr "Por favor indique um directório para partilhar."
 #: ../bin/draknfs:516
 #, c-format
 msgid "Please use the modify button to set right access."
-msgstr "Por favor indique o botão de modificação para definir o acesso correcto."
+msgstr ""
+"Por favor indique o botão de modificação para definir o acesso correcto."
 
 #: ../bin/draknfs:531
 #, c-format
@@ -1997,7 +2001,8 @@ msgstr "Direitos de Autor (C) %s Mandriva"
 #: ../bin/draksambashare:197
 #, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
-msgstr "Esta é uma ferramenta simples para facilmente gerir a configuração Samba"
+msgstr ""
+"Esta é uma ferramenta simples para facilmente gerir a configuração Samba"
 
 #: ../bin/draksambashare:199
 #, c-format
@@ -2059,7 +2064,8 @@ msgstr ""
 #: ../bin/draksambashare:400
 #, c-format
 msgid "Can't create the directory, please enter a correct path."
-msgstr "Não é possível criar o directório, por favor indique a localização correcta."
+msgstr ""
+"Não é possível criar o directório, por favor indique a localização correcta."
 
 #: ../bin/draksambashare:403 ../bin/draksambashare:632
 #: ../bin/draksambashare:799
@@ -2084,7 +2090,8 @@ msgstr "Adicionar Partilha de Impressora Especial"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "O objectivo deste assistente é facilmente criar uma nova partilha Samba de "
 "impressoras."
@@ -2109,12 +2116,7 @@ msgstr "Parabéns"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "O assistente adicionou com sucesso a partilha Samba da impressora"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Falha ao adicionar impressoras."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2194,7 +2196,8 @@ msgstr "Entrada DrakSamba"
 #: ../bin/draksambashare:705
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Por favor adicione ou seleccione uma partilha Samba para a poder modificar."
+msgstr ""
+"Por favor adicione ou seleccione uma partilha Samba para a poder modificar."
 
 #: ../bin/draksambashare:728
 #, c-format
@@ -2228,7 +2231,8 @@ msgstr "Público:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "A máscara, o modo criar e a máscara do directório deve ser numérica. p.ex.: "
 "0755."
@@ -2284,8 +2288,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"O samba permite ao seu servidor comportar-se como um ficheiro e "
-"mostrar o servidor a ambientes de trabalho a correrem sistemas não-Linux."
+"O samba permite ao seu servidor comportar-se como um ficheiro e mostrar o "
+"servidor a ambientes de trabalho a correrem sistemas não-Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2298,12 +2302,13 @@ msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr ""
-"Um servidor configurado como um PDC é responsável pela autenticação "
-"Windows através do domínio."
+"Um servidor configurado como um PDC é responsável pela autenticação Windows "
+"através do domínio."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr "Instalações de servidores únicas podem usar senhas smbpasswd ou tdbsam"
 
 #: ../bin/draksambashare:1082
@@ -2344,11 +2349,11 @@ msgid ""
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
 msgstr ""
-"As opções globais de nível do SO determinam o nível o sistema operativo "
-"a que o Samba irá mascarar-se durante a eleição do navegador. Se deseja "
-"que o Samba ganhe a eleição do navegador principal, pode aumentar o nível "
-"do sistema operativo na sua rede até ao valor do nível máximo actual. "
-"p.ex.: os level = 34"
+"As opções globais de nível do SO determinam o nível o sistema operativo a "
+"que o Samba irá mascarar-se durante a eleição do navegador. Se deseja que o "
+"Samba ganhe a eleição do navegador principal, pode aumentar o nível do "
+"sistema operativo na sua rede até ao valor do nível máximo actual. p.ex.: os "
+"level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2392,13 +2397,14 @@ msgid ""
 "protocol negotiation. This request provides a username and password."
 msgstr ""
 "Nível do utilizador: o cliente envia directamente um pedido de configuração "
-"da sessão seguindo o protocolo de negociação. Este pedido fornece um "
-"nome de utilizador e uma senha."
+"da sessão seguindo o protocolo de negociação. Este pedido fornece um nome de "
+"utilizador e uma senha."
 
 #: ../bin/draksambashare:1131
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Nível de partilha: o cliente autentica-se separadamente para cada partilha"
+msgstr ""
+"Nível de partilha: o cliente autentica-se separadamente para cada partilha"
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2408,8 +2414,9 @@ msgid ""
 "is shared between domain (security) controllers."
 msgstr ""
 "Nível do domínio: fornece um mecanismo para armazenar todos os utilizadores "
-"e agrupar contas numa central, partilhados, repositório de contas. O repositório "
-"de contas centralizado é partilhado entre os controladores de domínio (segurança)."
+"e agrupar contas numa central, partilhados, repositório de contas. O "
+"repositório de contas centralizado é partilhado entre os controladores de "
+"domínio (segurança)."
 
 #: ../bin/draksambashare:1142
 #, c-format
@@ -2426,7 +2433,9 @@ msgstr "Anúncio do Servidor."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "O anúncio é a maneira deste servidor ser descrito nas áreas de trabalho Windows."
+msgstr ""
+"O anúncio é a maneira deste servidor ser descrito nas áreas de trabalho "
+"Windows."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2449,18 +2458,22 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Ficheiro de registo: use ficheiro.%m para usar um ficheiro de registo de separação "
-"para cada máquina que se conecta."
+"Ficheiro de registo: use ficheiro.%m para usar um ficheiro de registo de "
+"separação para cada máquina que se conecta."
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Nível de registo: define o nível (detalhe) do registo (0 <= nível do registo <= 10)"
+msgstr ""
+"Nível de registo: define o nível (detalhe) do registo (0 <= nível do registo "
+"<= 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Tamanho Máximo do Registo: ponha um limite no tamanho dos ficheiros de registo (em Kb)."
+msgstr ""
+"Tamanho Máximo do Registo: ponha um limite no tamanho dos ficheiros de "
+"registo (em Kb)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2488,8 +2501,8 @@ msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
-"Para aceitar estes valores, e configurar o seu servidor, clique no botão Próximo "
-"ou use o botão Voltar para os corrigir."
+"Para aceitar estes valores, e configurar o seu servidor, clique no botão "
+"Próximo ou use o botão Voltar para os corrigir."
 
 #: ../bin/draksambashare:1177
 #, c-format
@@ -2515,12 +2528,7 @@ msgstr "Anúncio do servidor:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "O assistente configurou com sucesso o seu servidor Samba."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Falha ao configurar o servidor Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "O assistente Samba falhou inesperadamente:"
@@ -2585,7 +2593,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Utilizadores Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Falha ao configurar o servidor Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "O DraSamba gere as partilhas Samba"
@@ -4406,7 +4426,8 @@ msgstr "Obtido endereço de rede no interface %s (protocolo %s)"
 #: ../lib/network/connection/ethernet.pm:278
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Não foi possível obter um endereço de rede no interface %s (protocolo %s)"
+msgstr ""
+"Não foi possível obter um endereço de rede no interface %s (protocolo %s)"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -4790,12 +4811,17 @@ msgstr "WEP Restricto"
 msgid "WPA Pre-Shared Key"
 msgstr "Chave Pré-Partilhada WPA"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "São necessários os ficheiros 'firmware' para este dispositivo."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4844,7 +4870,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr "Modo de encriptação"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Nome de utilizador (da conta)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Senha"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nome do certificado"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4931,7 +5008,182 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpriv(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocolo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-detectar"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificado"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "É necessária uma chave de encriptação."
@@ -5442,7 +5694,8 @@ msgstr "Automático"
 #: ../lib/network/ndiswrapper.pm:27
 #, c-format
 msgid "No device supporting the %s ndiswrapper driver is present!"
-msgstr "Nenhum dispositivo a suportar o controlador ndiswrapper %s está presente!"
+msgstr ""
+"Nenhum dispositivo a suportar o controlador ndiswrapper %s está presente!"
 
 #: ../lib/network/ndiswrapper.pm:33
 #, c-format
@@ -5454,12 +5707,7 @@ msgstr "Por favor seleccione o controlador Windows (ficheiro .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Não é possível instalar o controlador %s ndiswrapper!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Não é possível carregar o módulo ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5468,7 +5716,12 @@ msgstr ""
 "O dispositivo seleccionado já foi configurado com o controlador %s.\n"
 "Deseja realmente usar um controlador ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Não é possível carregar o módulo ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Não é possível encontrar o interface ndiswrapper!"
@@ -6184,7 +6437,12 @@ msgstr ""
 "Os ficheiros pedidos podem também ser instalados a partir deste URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "São necessários os ficheiros 'firmware' para este dispositivo."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar uma disquete"
@@ -6246,7 +6504,8 @@ msgstr "A procurar software e controladores pedidos..."
 #: ../lib/network/thirdparty.pm:340
 #, c-format
 msgid "Please wait, running device configuration commands..."
-msgstr "Por favor aguarde, a executar os comandos de configuração dos dispositivos..."
+msgstr ""
+"Por favor aguarde, a executar os comandos de configuração dos dispositivos..."
 
 #: ../lib/network/vpn/openvpn.pm:107
 #, c-format
@@ -6384,3 +6643,5 @@ msgstr "Usar encapsulação Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Usar porto UDP específico"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Falha ao adicionar impressoras."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 233ea36..897ede1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-14 10:11-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -2120,12 +2120,7 @@ msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 "O assistente adicionou com sucesso o compartilhamento da impressora Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Falha ao adicionar impressoras."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2298,8 +2293,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"O samba permite ao seu servidor comportar-se como um servidor de arquivos "
-"e de impressão para as estações rodando sistemas não-Linux."
+"O samba permite ao seu servidor comportar-se como um servidor de arquivos e "
+"de impressão para as estações rodando sistemas não-Linux."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2360,11 +2355,11 @@ msgid ""
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
 msgstr ""
-"A opção global os level determina o nível do sistema operacional com que "
-"o Samba irá se apresentar durante uma eleição de navegação. Se você "
-"deseja que o Samba ganhe a eleição e se torne o navegador principal, você "
-"pode aumentar o nível para um valor acima do sistema operacional na sua rede. "
-"p.ex.: os level = 34"
+"A opção global os level determina o nível do sistema operacional com que o "
+"Samba irá se apresentar durante uma eleição de navegação. Se você deseja que "
+"o Samba ganhe a eleição e se torne o navegador principal, você pode aumentar "
+"o nível para um valor acima do sistema operacional na sua rede. p.ex.: os "
+"level = 34"
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2407,13 +2402,15 @@ msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
 msgstr ""
-"Nível de usuário: o cliente envia um pedido de configuração da sessão após "
-"a negociação do protocolo. Este pedido fornece um nome de usuário e a senha."
+"Nível de usuário: o cliente envia um pedido de configuração da sessão após a "
+"negociação do protocolo. Este pedido fornece um nome de usuário e a senha."
 
 #: ../bin/draksambashare:1131
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Nível de compartilhamento: o cliente authentica-se separadamente para cada compartilhamento"
+msgstr ""
+"Nível de compartilhamento: o cliente authentica-se separadamente para cada "
+"compartilhamento"
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2466,7 +2463,8 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Arquivo Log: use arquivo.%m para usar usar um log separado por máquina que se conecta"
+"Arquivo Log: use arquivo.%m para usar usar um log separado por máquina que "
+"se conecta"
 
 #: ../bin/draksambashare:1163
 #, c-format
@@ -2496,7 +2494,8 @@ msgstr "Nível de Log:"
 #: ../bin/draksambashare:1177
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "Este assistente coletou os seguintes parâmetros para configurar o Samba."
+msgstr ""
+"Este assistente coletou os seguintes parâmetros para configurar o Samba."
 
 #: ../bin/draksambashare:1177
 #, c-format
@@ -2531,12 +2530,7 @@ msgstr "Banner do servidor:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Este assistente configurou com sucesso seu servidor Samba."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Falha ao configurar o servidor Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "O assistente Samba falhou inesperadamente:"
@@ -2601,7 +2595,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Usuários Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Falha ao configurar o servidor Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba gerencia compartilhamentos Samba"
@@ -4806,12 +4812,17 @@ msgstr "WEP Restrito"
 msgid "WPA Pre-Shared Key"
 msgstr "Chave WPA pré-compartilhada"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Arquivos de firmware são necessários para este dispositivo."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4860,7 +4871,58 @@ msgstr "Automático"
 msgid "Encryption mode"
 msgstr "Modo de criptografia"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Nome da conta (nome do usuário)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Senha"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Nome do certificado"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4947,7 +5009,182 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpriv(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocolo"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Detecção automática"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modo"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certificado"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Uma chave de cifragem é necessária."
@@ -5471,12 +5708,7 @@ msgstr "Por favor, selecione o driver Windows (arquivo .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Não foi possível instalar o driver ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Não foi possível carregar o módulo ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5485,7 +5717,12 @@ msgstr ""
 "O dispositivo selecionado já foi configurado com o driver %s.\n"
 "Você realmente quer usar um driver ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Não foi possível carregar o módulo ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Não foi possível encontrar a interface ndiswrapper!"
@@ -6205,7 +6442,12 @@ msgstr ""
 "Os arquivos necessários também podem ser instalados desta URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Arquivos de firmware são necessários para este dispositivo."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar um disquete"
@@ -6406,5 +6648,8 @@ msgstr "Use encapsulamento Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Utilizar porta UDP específica"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Falha ao adicionar impressoras."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Obter Ajuda On-line"
diff --git a/po/ro.po b/po/ro.po
index dad639c..ed7ab1f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 7.1\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2003-09-11 18:11+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -2007,12 +2007,7 @@ msgstr "Felicitări"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2388,12 +2383,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2458,7 +2448,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4323,12 +4325,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4375,7 +4382,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Cont: (nume utilizator)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parola"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4429,7 +4487,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-detecţie"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4915,19 +5148,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5598,7 +5831,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Foloseşte o dischetă"
diff --git a/po/ru.po b/po/ru.po
index 7286361..83ab7ce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-04 15:23+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/drakconnect:61
-#: ../lib/network/netconnect.pm:118
+#: ../bin/drakconnect:61 ../lib/network/netconnect.pm:118
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Настройка сети и Интернета"
@@ -27,53 +26,40 @@ msgstr "Настройка сети и Интернета"
 msgid "Network configuration (%d adapters)"
 msgstr "Конфигурация сети  (%d адаптеров)"
 
-#: ../bin/drakconnect:93
-#: ../bin/drakconnect:813
+#: ../bin/drakconnect:93 ../bin/drakconnect:813
 #, c-format
 msgid "Gateway:"
 msgstr "Шлюз:"
 
-#: ../bin/drakconnect:93
-#: ../bin/drakconnect:813
+#: ../bin/drakconnect:93 ../bin/drakconnect:813
 #, c-format
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../bin/drakconnect:97
-#: ../bin/net_monitor:119
+#: ../bin/drakconnect:97 ../bin/net_monitor:119
 #, c-format
 msgid "Wait please"
 msgstr "Подождите, пожалуйста"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakinvictus:105
+#: ../bin/drakconnect:113 ../bin/drakinvictus:105
 #, c-format
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakconnect:321
-#: ../bin/drakconnect:888
-#: ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:125
-#: ../lib/network/netconnect.pm:612
-#: ../lib/network/vpn/openvpn.pm:221
+#: ../bin/drakconnect:113 ../bin/drakconnect:321 ../bin/drakconnect:888
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:125
+#: ../lib/network/netconnect.pm:612 ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: ../bin/drakconnect:113
-#: ../bin/drakconnect:305
-#: ../bin/drakconnect:563
-#: ../bin/drakids:252
-#: ../bin/drakvpn-old:839
-#: ../lib/network/netconnect.pm:456
+#: ../bin/drakconnect:113 ../bin/drakconnect:305 ../bin/drakconnect:563
+#: ../bin/drakids:252 ../bin/drakvpn-old:839 ../lib/network/netconnect.pm:456
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../bin/drakconnect:113
-#: ../lib/network/netconnect.pm:442
+#: ../bin/drakconnect:113 ../lib/network/netconnect.pm:442
 #, c-format
 msgid "Driver"
 msgstr "Драйвер"
@@ -93,8 +79,7 @@ msgstr "Имя хоста:"
 msgid "Configure hostname..."
 msgstr "Настроить имя хоста..."
 
-#: ../bin/drakconnect:146
-#: ../bin/drakconnect:851
+#: ../bin/drakconnect:146 ../bin/drakconnect:851
 #, c-format
 msgid "LAN configuration"
 msgstr "Настройка локальной сети"
@@ -104,53 +89,38 @@ msgstr "Настройка локальной сети"
 msgid "Configure Local Area Network..."
 msgstr "Настроить локальную сеть..."
 
-#: ../bin/drakconnect:157
-#: ../bin/drakconnect:240
-#: ../bin/draknfs:186
+#: ../bin/drakconnect:157 ../bin/drakconnect:240 ../bin/draknfs:186
 #: ../bin/net_applet:138
 #, c-format
 msgid "Help"
 msgstr "Справка"
 
-#: ../bin/drakconnect:159
-#: ../bin/drakconnect:241
-#: ../bin/drakconnect:245
+#: ../bin/drakconnect:159 ../bin/drakconnect:241 ../bin/drakconnect:245
 #: ../bin/drakinvictus:140
 #, c-format
 msgid "Apply"
 msgstr "Применить"
 
-#: ../bin/drakconnect:161
-#: ../bin/drakconnect:943
-#: ../bin/drakconnect:1034
-#: ../bin/draknetprofile:106
-#: ../bin/net_monitor:341
+#: ../bin/drakconnect:161 ../bin/drakconnect:943 ../bin/drakconnect:1034
+#: ../bin/draknetprofile:106 ../bin/net_monitor:341
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../bin/drakconnect:162
-#: ../bin/drakconnect:858
-#: ../bin/drakconnect:945
-#: ../bin/drakconnect:1035
-#: ../bin/draknetprofile:108
-#: ../bin/net_monitor:342
+#: ../bin/drakconnect:162 ../bin/drakconnect:858 ../bin/drakconnect:945
+#: ../bin/drakconnect:1035 ../bin/draknetprofile:108 ../bin/net_monitor:342
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../bin/drakconnect:164
-#: ../bin/drakconnect:636
-#: ../bin/drakgw:359
-#: ../bin/draksambashare:228
-#: ../lib/network/connection_manager.pm:146
+#: ../bin/drakconnect:164 ../bin/drakconnect:636 ../bin/drakgw:359
+#: ../bin/draksambashare:228 ../lib/network/connection_manager.pm:146
 #: ../lib/network/connection_manager.pm:164
 #, c-format
 msgid "Please wait"
 msgstr "Подождите, пожалуйста"
 
-#: ../bin/drakconnect:166
-#: ../bin/drakconnect:638
+#: ../bin/drakconnect:166 ../bin/drakconnect:638
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Подождите, пожалуйста... Применяются настройки"
@@ -160,8 +130,7 @@ msgstr "Подождите, пожалуйста... Применяются на�
 msgid "Manage connections"
 msgstr "Управление соединениями"
 
-#: ../bin/drakconnect:219
-#: ../lib/network/drakroam.pm:105
+#: ../bin/drakconnect:219 ../lib/network/drakroam.pm:105
 #, c-format
 msgid "Device: "
 msgstr "Устройство: "
@@ -171,18 +140,14 @@ msgstr "Устройство: "
 msgid "IP configuration"
 msgstr "Настройка IP"
 
-#: ../bin/drakconnect:326
-#: ../bin/drakconnect:889
-#: ../bin/drakgw:177
+#: ../bin/drakconnect:326 ../bin/drakconnect:889 ../bin/drakgw:177
 #: ../lib/network/connection/ethernet.pm:132
 #, c-format
 msgid "Netmask"
 msgstr "Сетевая маска"
 
-#: ../bin/drakconnect:332
-#: ../lib/network/connection/ethernet.pm:133
-#: ../lib/network/netconnect.pm:644
-#: ../lib/network/vpn/openvpn.pm:212
+#: ../bin/drakconnect:332 ../lib/network/connection/ethernet.pm:133
+#: ../lib/network/netconnect.pm:644 ../lib/network/vpn/openvpn.pm:212
 #: ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
@@ -198,8 +163,7 @@ msgstr "DNS сервера"
 msgid "Search Domain"
 msgstr "Поиск домена"
 
-#: ../bin/drakconnect:351
-#: ../bin/drakvpn-old:837
+#: ../bin/drakconnect:351 ../bin/drakvpn-old:837
 #, c-format
 msgid "none"
 msgstr "отсутствует"
@@ -214,119 +178,100 @@ msgstr "статический"
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../bin/drakconnect:369
-#: ../bin/drakconnect:892
+#: ../bin/drakconnect:369 ../bin/drakconnect:892
 #: ../lib/network/connection/ethernet.pm:143
 #, c-format
 msgid "DHCP client"
 msgstr "Клиент DHCP"
 
-#: ../bin/drakconnect:373
-#: ../lib/network/connection/ethernet.pm:201
+#: ../bin/drakconnect:373 ../lib/network/connection/ethernet.pm:201
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Определить имя хоста из адреса DHCP"
 
-#: ../bin/drakconnect:375
-#: ../lib/network/connection/ethernet.pm:147
+#: ../bin/drakconnect:375 ../lib/network/connection/ethernet.pm:147
 #, c-format
 msgid "DHCP host name"
 msgstr "Имя хоста DHCP"
 
-#: ../bin/drakconnect:379
-#: ../lib/network/connection/ethernet.pm:144
+#: ../bin/drakconnect:379 ../lib/network/connection/ethernet.pm:144
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Тайм-аут DHCP (в секундах)"
 
-#: ../bin/drakconnect:382
-#: ../lib/network/connection/ethernet.pm:136
+#: ../bin/drakconnect:382 ../lib/network/connection/ethernet.pm:136
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Получать серверы DNS от DHCP"
 
-#: ../bin/drakconnect:383
-#: ../lib/network/connection/ethernet.pm:145
+#: ../bin/drakconnect:383 ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Получать серверы YP от DHCP"
 
-#: ../bin/drakconnect:384
-#: ../lib/network/connection/ethernet.pm:146
+#: ../bin/drakconnect:384 ../lib/network/connection/ethernet.pm:146
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Получать серверы NTPD от DHCP"
 
-#: ../bin/drakconnect:406
-#: ../lib/network/connection/wireless.pm:327
+#: ../bin/drakconnect:406 ../lib/network/connection/wireless.pm:327
 #: ../lib/network/connection_manager.pm:204
 #, c-format
 msgid "Operating Mode"
 msgstr "Режим управления"
 
-#: ../bin/drakconnect:407
-#: ../lib/network/connection/wireless.pm:331
+#: ../bin/drakconnect:407 ../lib/network/connection/wireless.pm:331
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Сетевое имя (ESSID)"
 
-#: ../bin/drakconnect:408
-#: ../lib/network/connection/wireless.pm:337
+#: ../bin/drakconnect:408 ../lib/network/connection/wireless.pm:337
 #, c-format
 msgid "Network ID"
 msgstr "Сетевой ID"
 
-#: ../bin/drakconnect:409
-#: ../lib/network/connection/wireless.pm:338
+#: ../bin/drakconnect:409 ../lib/network/connection/wireless.pm:338
 #, c-format
 msgid "Operating frequency"
 msgstr "Рабочая частота"
 
-#: ../bin/drakconnect:410
-#: ../lib/network/connection/wireless.pm:339
+#: ../bin/drakconnect:410 ../lib/network/connection/wireless.pm:339
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Порог чувствительности"
 
-#: ../bin/drakconnect:411
-#: ../lib/network/connection/wireless.pm:340
+#: ../bin/drakconnect:411 ../lib/network/connection/wireless.pm:340
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../bin/drakconnect:421
-#: ../lib/network/connection/wireless.pm:335
+#: ../bin/drakconnect:421 ../lib/network/connection/wireless.pm:335
 #, c-format
 msgid "Encryption key"
 msgstr "Ключ шифрования"
 
-#: ../bin/drakconnect:422
-#: ../lib/network/connection/wireless.pm:341
+#: ../bin/drakconnect:422 ../lib/network/connection/wireless.pm:341
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../bin/drakconnect:423
-#: ../lib/network/connection/wireless.pm:349
+#: ../bin/drakconnect:423 ../lib/network/connection/wireless.pm:349
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментация"
 
-#: ../bin/drakconnect:424
-#: ../lib/network/connection/wireless.pm:350
+#: ../bin/drakconnect:424 ../lib/network/connection/wireless.pm:350
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Дополнительные аргументы команды iwconfig"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../bin/drakconnect:425
-#: ../lib/network/connection/wireless.pm:358
+#: ../bin/drakconnect:425 ../lib/network/connection/wireless.pm:358
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Дополнительные аргументы команды iwspy"
 
-#: ../bin/drakconnect:426
-#: ../lib/network/connection/wireless.pm:367
+#: ../bin/drakconnect:426 ../lib/network/connection/wireless.pm:367
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Дополнительные аргументы команды iwpriv"
@@ -336,98 +281,82 @@ msgstr "Дополнительные аргументы команды iwpriv"
 msgid "Start at boot"
 msgstr "Запускать при загрузке"
 
-#: ../bin/drakconnect:440
-#: ../lib/network/connection/ethernet.pm:221
+#: ../bin/drakconnect:440 ../lib/network/connection/ethernet.pm:221
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Горячая\" коммутация"
 
-#: ../bin/drakconnect:446
-#: ../lib/network/netconnect.pm:331
+#: ../bin/drakconnect:446 ../lib/network/netconnect.pm:331
 #, c-format
 msgid "Dialing mode"
 msgstr "Режим дозвона"
 
-#: ../bin/drakconnect:451
-#: ../bin/drakconnect:518
+#: ../bin/drakconnect:451 ../bin/drakconnect:518
 #: ../lib/network/netconnect.pm:332
 #, c-format
 msgid "Connection speed"
 msgstr "Скорость соединения"
 
-#: ../bin/drakconnect:456
-#: ../lib/network/netconnect.pm:333
+#: ../bin/drakconnect:456 ../lib/network/netconnect.pm:333
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Тайм-аут соединения (в секундах)"
 
-#: ../bin/drakconnect:462
-#: ../lib/network/connection.pm:186
+#: ../bin/drakconnect:462 ../lib/network/connection.pm:186
 #, c-format
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../bin/drakconnect:482
-#: ../lib/network/connection/cable.pm:48
+#: ../bin/drakconnect:482 ../lib/network/connection/cable.pm:48
 #: ../lib/network/netconnect.pm:595
 #, c-format
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: ../bin/drakconnect:492
-#: ../lib/network/connection/cable.pm:50
-#: ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:334
+#: ../bin/drakconnect:492 ../lib/network/connection/cable.pm:50
+#: ../lib/network/connection/ppp.pm:22 ../lib/network/netconnect.pm:334
 #: ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Логин (имя пользователя)"
 
-#: ../bin/drakconnect:493
-#: ../lib/network/connection/cable.pm:52
-#: ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:335
+#: ../bin/drakconnect:493 ../lib/network/connection/cable.pm:52
+#: ../lib/network/connection/ppp.pm:23 ../lib/network/netconnect.pm:335
 #: ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "Пароль"
 
-#: ../bin/drakconnect:494
-#: ../lib/network/netconnect.pm:328
+#: ../bin/drakconnect:494 ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Provider phone number"
 msgstr "Номер телефона провайдера"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:10
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:10
 #: ../lib/network/netconnect.pm:75
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:11
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:11
 #: ../lib/network/netconnect.pm:76
 #, c-format
 msgid "Terminal-based"
 msgstr "На базе терминала"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:9
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:9
 #: ../lib/network/netconnect.pm:74
 #, c-format
 msgid "Script-based"
 msgstr "На базе скрипта"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:12
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:12
 #: ../lib/network/netconnect.pm:77
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../bin/drakconnect:499
-#: ../lib/network/connection/ppp.pm:13
+#: ../bin/drakconnect:499 ../lib/network/connection/ppp.pm:13
 #: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "PAP/CHAP"
@@ -468,50 +397,42 @@ msgstr "Busy ожидание"
 msgid "Modem sound"
 msgstr "Звук модема"
 
-#: ../bin/drakconnect:543
-#: ../bin/drakgw:101
+#: ../bin/drakconnect:543 ../bin/drakgw:101
 #, c-format
 msgid "Enable"
 msgstr "Включить"
 
-#: ../bin/drakconnect:543
-#: ../bin/drakgw:101
+#: ../bin/drakconnect:543 ../bin/drakgw:101
 #, c-format
 msgid "Disable"
 msgstr "Отключить"
 
-#: ../bin/drakconnect:555
-#: ../lib/network/netconnect.pm:336
+#: ../bin/drakconnect:555 ../lib/network/netconnect.pm:336
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ карты"
 
-#: ../bin/drakconnect:556
-#: ../lib/network/netconnect.pm:337
+#: ../bin/drakconnect:556 ../lib/network/netconnect.pm:337
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Память карты (DMA)"
 
-#: ../bin/drakconnect:557
-#: ../lib/network/netconnect.pm:338
+#: ../bin/drakconnect:557 ../lib/network/netconnect.pm:338
 #, c-format
 msgid "Card IO"
 msgstr "IO карты"
 
-#: ../bin/drakconnect:558
-#: ../lib/network/netconnect.pm:339
+#: ../bin/drakconnect:558 ../lib/network/netconnect.pm:339
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_0 карты"
 
-#: ../bin/drakconnect:564
-#: ../lib/network/netconnect.pm:67
+#: ../bin/drakconnect:564 ../lib/network/netconnect.pm:67
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Европейский протокол (EDSS1)"
 
-#: ../bin/drakconnect:565
-#: ../lib/network/netconnect.pm:68
+#: ../bin/drakconnect:565 ../lib/network/netconnect.pm:68
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -555,114 +476,75 @@ msgstr "Шина"
 msgid "Location on the bus"
 msgstr "Расположение шины"
 
-#: ../bin/drakconnect:676
-#: ../bin/drakconnect:680
-#: ../bin/drakconnect:689
-#: ../bin/drakconnect:705
-#: ../bin/drakgw:184
-#: ../bin/drakhosts:100
-#: ../bin/drakhosts:245
-#: ../bin/drakhosts:252
-#: ../bin/drakhosts:259
-#: ../bin/drakinvictus:72
-#: ../bin/draknetprofile:113
-#: ../bin/draknfs:88
-#: ../bin/draknfs:109
-#: ../bin/draknfs:279
-#: ../bin/draknfs:412
-#: ../bin/draknfs:414
-#: ../bin/draknfs:417
-#: ../bin/draknfs:509
-#: ../bin/draknfs:516
-#: ../bin/draknfs:579
-#: ../bin/draknfs:586
-#: ../bin/draknfs:593
-#: ../bin/draksambashare:393
-#: ../bin/draksambashare:400
-#: ../bin/draksambashare:403
-#: ../bin/draksambashare:455
-#: ../bin/draksambashare:479
-#: ../bin/draksambashare:545
-#: ../bin/draksambashare:560
-#: ../bin/draksambashare:638
-#: ../bin/draksambashare:705
-#: ../bin/draksambashare:805
-#: ../bin/draksambashare:812
-#: ../bin/draksambashare:951
-#: ../bin/draksambashare:1105
-#: ../bin/draksambashare:1124
-#: ../bin/draksambashare:1156
-#: ../bin/draksambashare:1213
-#: ../bin/draksambashare:1263
-#: ../bin/draksambashare:1365
-#: ../bin/draksambashare:1374
-#: ../bin/draksambashare:1396
-#: ../bin/draksambashare:1405
-#: ../bin/draksambashare:1424
-#: ../bin/draksambashare:1433
-#: ../bin/draksambashare:1445
-#: ../lib/network/connection/xdsl.pm:332
+#: ../bin/drakconnect:676 ../bin/drakconnect:680 ../bin/drakconnect:689
+#: ../bin/drakconnect:705 ../bin/drakgw:184 ../bin/drakhosts:100
+#: ../bin/drakhosts:245 ../bin/drakhosts:252 ../bin/drakhosts:259
+#: ../bin/drakinvictus:72 ../bin/draknetprofile:113 ../bin/draknfs:88
+#: ../bin/draknfs:109 ../bin/draknfs:279 ../bin/draknfs:412 ../bin/draknfs:414
+#: ../bin/draknfs:417 ../bin/draknfs:509 ../bin/draknfs:516 ../bin/draknfs:579
+#: ../bin/draknfs:586 ../bin/draknfs:593 ../bin/draksambashare:393
+#: ../bin/draksambashare:400 ../bin/draksambashare:403
+#: ../bin/draksambashare:455 ../bin/draksambashare:479
+#: ../bin/draksambashare:545 ../bin/draksambashare:560
+#: ../bin/draksambashare:638 ../bin/draksambashare:705
+#: ../bin/draksambashare:805 ../bin/draksambashare:812
+#: ../bin/draksambashare:951 ../bin/draksambashare:1105
+#: ../bin/draksambashare:1124 ../bin/draksambashare:1156
+#: ../bin/draksambashare:1213 ../bin/draksambashare:1263
+#: ../bin/draksambashare:1365 ../bin/draksambashare:1374
+#: ../bin/draksambashare:1396 ../bin/draksambashare:1405
+#: ../bin/draksambashare:1424 ../bin/draksambashare:1433
+#: ../bin/draksambashare:1445 ../lib/network/connection/xdsl.pm:332
 #: ../lib/network/connection_manager.pm:41
 #: ../lib/network/connection_manager.pm:47
 #: ../lib/network/connection_manager.pm:60
 #: ../lib/network/connection_manager.pm:115
-#: ../lib/network/connection_manager.pm:119
-#: ../lib/network/drakvpn.pm:45
-#: ../lib/network/drakvpn.pm:52
-#: ../lib/network/ndiswrapper.pm:27
-#: ../lib/network/ndiswrapper.pm:42
-#: ../lib/network/ndiswrapper.pm:86
-#: ../lib/network/ndiswrapper.pm:102
-#: ../lib/network/netconnect.pm:131
-#: ../lib/network/netconnect.pm:179
-#: ../lib/network/netconnect.pm:235
-#: ../lib/network/netconnect.pm:276
-#: ../lib/network/netconnect.pm:821
-#: ../lib/network/thirdparty.pm:115
-#: ../lib/network/thirdparty.pm:132
-#: ../lib/network/thirdparty.pm:215
-#: ../lib/network/thirdparty.pm:217
+#: ../lib/network/connection_manager.pm:119 ../lib/network/drakvpn.pm:45
+#: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:27
+#: ../lib/network/ndiswrapper.pm:42 ../lib/network/ndiswrapper.pm:86
+#: ../lib/network/ndiswrapper.pm:102 ../lib/network/netconnect.pm:131
+#: ../lib/network/netconnect.pm:179 ../lib/network/netconnect.pm:235
+#: ../lib/network/netconnect.pm:276 ../lib/network/netconnect.pm:821
+#: ../lib/network/thirdparty.pm:115 ../lib/network/thirdparty.pm:132
+#: ../lib/network/thirdparty.pm:215 ../lib/network/thirdparty.pm:217
 #: ../lib/network/thirdparty.pm:238
 #, c-format
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../bin/drakconnect:676
-#: ../lib/network/connection/ethernet.pm:160
+#: ../bin/drakconnect:676 ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-адрес должен быть в формате 1.2.3.4"
 
-#: ../bin/drakconnect:680
-#: ../lib/network/connection/ethernet.pm:165
+#: ../bin/drakconnect:680 ../lib/network/connection/ethernet.pm:165
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Сетевая маска должна быть в формате 255.255.224.0"
 
-#: ../bin/drakconnect:685
-#: ../bin/drakconnect:767
-#: ../bin/drakconnect:953
+#: ../bin/drakconnect:685 ../bin/drakconnect:767 ../bin/drakconnect:953
 #, c-format
 msgid "No IP"
 msgstr "Отсутствует IP"
 
-#: ../bin/drakconnect:686
-#: ../bin/drakconnect:768
+#: ../bin/drakconnect:686 ../bin/drakconnect:768
 #, c-format
 msgid "No Mask"
 msgstr "Отсутствует Маска"
 
-#: ../bin/drakconnect:689
-#: ../lib/network/netconnect.pm:806
+#: ../bin/drakconnect:689 ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Адрес шлюза должен быть в формате 1.2.3.4"
 
-#: ../bin/drakconnect:705
-#: ../bin/drakgw:307
+#: ../bin/drakconnect:705 ../bin/drakgw:307
 #, c-format
-msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
-msgstr "В вашей системе не обнаружен сетевой адаптер. Пожалуйста, запустите утилиту настройки оборудования."
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"В вашей системе не обнаружен сетевой адаптер. Пожалуйста, запустите утилиту "
+"настройки оборудования."
 
 #: ../bin/drakconnect:714
 #, c-format
@@ -674,9 +556,7 @@ msgstr "Удалить сетевой интерфейс"
 msgid "Select the network interface to remove:"
 msgstr "Выберите сетевой интерфейс для удаления:"
 
-#: ../bin/drakconnect:719
-#: ../bin/drakgw:123
-#: ../lib/network/netconnect.pm:358
+#: ../bin/drakconnect:719 ../bin/drakgw:123 ../lib/network/netconnect.pm:358
 #: ../lib/network/netconnect.pm:393
 #, c-format
 msgid "Net Device"
@@ -695,7 +575,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Поздравления, сетевой интерфейс\"%s\" был успешно удалён"
 
 #: ../bin/drakconnect:769
@@ -708,14 +589,12 @@ msgstr "поднят"
 msgid "down"
 msgstr "опущен"
 
-#: ../bin/drakconnect:804
-#: ../bin/net_monitor:465
+#: ../bin/drakconnect:804 ../bin/net_monitor:465
 #, c-format
 msgid "Connected"
 msgstr "Подключён"
 
-#: ../bin/drakconnect:804
-#: ../bin/net_monitor:465
+#: ../bin/drakconnect:804 ../bin/net_monitor:465
 #, c-format
 msgid "Not connected"
 msgstr "Не подключён"
@@ -776,27 +655,23 @@ msgid ""
 "Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Этот интерфейс ещё не был настроен.\n"
-"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandriva Linux"
+"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandriva "
+"Linux"
 
 #: ../bin/drakconnect:975
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Настройка подключения к Интернету"
 
-#: ../bin/drakconnect:979
-#: ../bin/draknetprofile:129
-#: ../bin/draknetprofile:131
-#: ../bin/drakproxy:36
-#: ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:92
+#: ../bin/drakconnect:979 ../bin/draknetprofile:129 ../bin/draknetprofile:131
+#: ../bin/drakproxy:36 ../lib/network/drakvpn.pm:70
+#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:92
 #: ../lib/network/netconnect.pm:479
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../bin/drakconnect:981
-#: ../bin/net_applet:69
+#: ../bin/drakconnect:981 ../bin/net_applet:69
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -806,8 +681,7 @@ msgstr ""
 "Запустите помощника \"%s\" из Центра Управления Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: ../bin/drakconnect:982
-#: ../bin/net_applet:70
+#: ../bin/drakconnect:982 ../bin/net_applet:70
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Настройка нового сетевого интерфейса (LAN, ISDN, ADSL, ...)"
@@ -817,14 +691,12 @@ msgstr "Настройка нового сетевого интерфейса (L
 msgid "Host name (optional)"
 msgstr "Имя хоста (опционально)"
 
-#: ../bin/drakconnect:997
-#: ../lib/network/netconnect.pm:630
+#: ../bin/drakconnect:997 ../lib/network/netconnect.pm:630
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Первый сервер DNS (необязательно)"
 
-#: ../bin/drakconnect:998
-#: ../lib/network/netconnect.pm:631
+#: ../bin/drakconnect:998 ../lib/network/netconnect.pm:631
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Второй сервер DNS (необязательно)"
@@ -844,8 +716,7 @@ msgstr "Настройка подключения к Интернету"
 msgid "Internet access"
 msgstr "Доступ к Интернету"
 
-#: ../bin/drakconnect:1024
-#: ../bin/net_monitor:98
+#: ../bin/drakconnect:1024 ../bin/net_monitor:98
 #, c-format
 msgid "Connection type: "
 msgstr "Тип соединения: "
@@ -855,8 +726,7 @@ msgstr "Тип соединения: "
 msgid "Status:"
 msgstr "Состояние:"
 
-#: ../bin/drakconnect:1028
-#: ../lib/network/netconnect.pm:712
+#: ../bin/drakconnect:1028 ../lib/network/netconnect.pm:712
 #, c-format
 msgid "Testing your connection..."
 msgstr "Проверяется ваше соединение..."
@@ -875,11 +745,14 @@ msgstr "Общий доступ к Интернету"
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
-"With that feature, other computers on your local network will be able to use this computer's Internet connection.\n"
+"With that feature, other computers on your local network will be able to use "
+"this computer's Internet connection.\n"
 "\n"
-"Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
 msgstr ""
 "Вы собираетесь настроить свой компьютер для совместного использования\n"
 "подключения к Интернету. Благодаря этой возможности, другие компьютеры в\n"
@@ -944,16 +817,18 @@ msgstr ""
 
 #: ../bin/drakgw:152
 #, c-format
-msgid "Please choose what network adapter will be connected to your Local Area Network."
-msgstr "Выберите сетевой адаптер, который будет подключён к вашей локальной сети."
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Выберите сетевой адаптер, который будет подключён к вашей локальной сети."
 
 #: ../bin/drakgw:173
 #, c-format
 msgid "Local Area Network settings"
 msgstr "Настройки локальной сети"
 
-#: ../bin/drakgw:176
-#: ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:176 ../lib/network/vpn/openvpn.pm:227
 #, c-format
 msgid "Local IP address"
 msgstr "Локальный IP-адрес"
@@ -966,7 +841,9 @@ msgstr "Имя внутреннего домена"
 #: ../bin/drakgw:184
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "Обнаружен возможный конфликт адреса локальной сети в текущей конфигурации %s!\n"
+msgstr ""
+"Обнаружен возможный конфликт адреса локальной сети в текущей конфигурации %"
+"s!\n"
 
 #: ../bin/drakgw:200
 #, c-format
@@ -994,7 +871,8 @@ msgstr ""
 "Настройка сервера DHCP.\n"
 "\n"
 "Здесь вы можете выбрать различные параметры для настройки сервера DHCP.\n"
-"Если вы не знаете, что означает тот или иной параметр, просто оставьте его как есть."
+"Если вы не знаете, что означает тот или иной параметр, просто оставьте его "
+"как есть."
 
 #: ../bin/drakgw:239
 #, c-format
@@ -1070,11 +948,13 @@ msgstr "Общий доступ к Интернету теперь отключ�
 #, c-format
 msgid ""
 "Everything has been configured.\n"
-"You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP) and\n"
+"You may now share Internet connection with other computers on your Local "
+"Area Network, using automatic network configuration (DHCP) and\n"
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 "Всё было настроено.\n"
-"Теперь вы можете использовать своё подключение к Интернету совместно с другими компьютерами вашей локальной сети, используя автоматическую\n"
+"Теперь вы можете использовать своё подключение к Интернету совместно с "
+"другими компьютерами вашей локальной сети, используя автоматическую\n"
 "настройку сети (DHCP) и кэширующий прокси-сервер (SQUID)."
 
 #: ../bin/drakgw:359
@@ -1089,8 +969,12 @@ msgstr "Обнаружена конфигурация файервола!"
 
 #: ../bin/drakgw:374
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Предупреждение! Были обнаружены существующие настройки файервола. Вам может понадобиться подправить их вручную после установки."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Предупреждение! Были обнаружены существующие настройки файервола. Вам может "
+"понадобиться подправить их вручную после установки."
 
 #: ../bin/drakgw:379
 #, c-format
@@ -1137,13 +1021,9 @@ msgstr "Имя хоста:"
 msgid "Host Aliases:"
 msgstr "Алиасы хоста:"
 
-#: ../bin/drakhosts:122
-#: ../bin/drakhosts:128
-#: ../bin/draksambashare:229
-#: ../bin/draksambashare:250
-#: ../bin/draksambashare:397
-#: ../bin/draksambashare:634
-#: ../bin/draksambashare:801
+#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draksambashare:229
+#: ../bin/draksambashare:250 ../bin/draksambashare:397
+#: ../bin/draksambashare:634 ../bin/draksambashare:801
 #, c-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -1158,8 +1038,7 @@ msgstr "Пожалуйста введите правильный IP адрес."
 msgid "Same IP is already in %s file."
 msgstr "Подобный IP уже находится в файле %s."
 
-#: ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:203
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:203
 #, c-format
 msgid "Host name"
 msgstr "Имя хоста"
@@ -1169,25 +1048,19 @@ msgstr "Имя хоста"
 msgid "Host Aliases"
 msgstr "Алиасы хоста"
 
-#: ../bin/drakhosts:206
-#: ../bin/drakhosts:236
+#: ../bin/drakhosts:206 ../bin/drakhosts:236
 #, c-format
 msgid "Manage hosts definitions"
 msgstr "Управление определениями хостов"
 
-#: ../bin/drakhosts:222
-#: ../bin/drakhosts:249
+#: ../bin/drakhosts:222 ../bin/drakhosts:249
 #, c-format
 msgid "Modify entry"
 msgstr "Изменить запись"
 
-#: ../bin/drakhosts:241
-#: ../bin/draknfs:575
-#: ../bin/draksambashare:1358
-#: ../bin/draksambashare:1389
-#: ../bin/draksambashare:1420
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakhosts:241 ../bin/draknfs:575 ../bin/draksambashare:1358
+#: ../bin/draksambashare:1389 ../bin/draksambashare:1420
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Add"
 msgstr "Добавить"
@@ -1202,11 +1075,8 @@ msgstr "Добавить запись"
 msgid "Failed to add host."
 msgstr "Не удалось добавить хост."
 
-#: ../bin/drakhosts:248
-#: ../bin/draknfs:582
-#: ../bin/draksambashare:1315
-#: ../bin/draksambashare:1360
-#: ../bin/draksambashare:1391
+#: ../bin/drakhosts:248 ../bin/draknfs:582 ../bin/draksambashare:1315
+#: ../bin/draksambashare:1360 ../bin/draksambashare:1391
 #: ../bin/draksambashare:1428
 #, c-format
 msgid "Modify"
@@ -1217,16 +1087,10 @@ msgstr "Изменить"
 msgid "Failed to Modify host."
 msgstr "Не удалось изменить хост."
 
-#: ../bin/drakhosts:255
-#: ../bin/drakids:87
-#: ../bin/drakids:96
-#: ../bin/draknfs:589
-#: ../bin/draksambashare:1316
-#: ../bin/draksambashare:1368
-#: ../bin/draksambashare:1399
-#: ../bin/draksambashare:1436
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakhosts:255 ../bin/drakids:87 ../bin/drakids:96 ../bin/draknfs:589
+#: ../bin/draksambashare:1316 ../bin/draksambashare:1368
+#: ../bin/draksambashare:1399 ../bin/draksambashare:1436
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Remove"
 msgstr "Удалить"
@@ -1236,11 +1100,8 @@ msgstr "Удалить"
 msgid "Failed to remove host."
 msgstr "Не удалось удалить хост."
 
-#: ../bin/drakhosts:262
-#: ../bin/drakinvictus:141
-#: ../bin/draknetprofile:147
-#: ../bin/net_applet:139
-#: ../lib/network/drakroam.pm:113
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:147
+#: ../bin/net_applet:139 ../lib/network/drakroam.pm:113
 #: ../lib/network/netcenter.pm:113
 #, c-format
 msgid "Quit"
@@ -1251,64 +1112,39 @@ msgstr "Выход"
 msgid "Allowed addresses"
 msgstr "Разрешённые адреса"
 
-#: ../bin/drakids:41
-#: ../bin/drakids:65
-#: ../bin/drakids:181
-#: ../bin/drakids:190
-#: ../bin/drakids:215
-#: ../bin/drakids:224
-#: ../bin/drakids:234
-#: ../bin/drakids:326
-#: ../bin/net_applet:78
-#: ../bin/net_applet:245
-#: ../bin/net_applet:521
-#: ../bin/net_applet:548
-#: ../lib/network/drakfirewall.pm:255
+#: ../bin/drakids:41 ../bin/drakids:65 ../bin/drakids:181 ../bin/drakids:190
+#: ../bin/drakids:215 ../bin/drakids:224 ../bin/drakids:234 ../bin/drakids:326
+#: ../bin/net_applet:78 ../bin/net_applet:245 ../bin/net_applet:521
+#: ../bin/net_applet:548 ../lib/network/drakfirewall.pm:255
 #: ../lib/network/drakfirewall.pm:258
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактивный файервол"
 
-#: ../bin/drakids:65
-#: ../bin/drakids:181
-#: ../bin/drakids:190
-#: ../bin/drakids:215
-#: ../bin/drakids:224
-#: ../bin/drakids:234
-#: ../bin/drakids:326
-#: ../bin/net_applet:245
-#: ../bin/net_applet:521
+#: ../bin/drakids:65 ../bin/drakids:181 ../bin/drakids:190 ../bin/drakids:215
+#: ../bin/drakids:224 ../bin/drakids:234 ../bin/drakids:326
+#: ../bin/net_applet:245 ../bin/net_applet:521
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Невозможно связаться с демоном"
 
-#: ../bin/drakids:74
-#: ../bin/drakids:102
+#: ../bin/drakids:74 ../bin/drakids:102
 #, c-format
 msgid "Log"
 msgstr "Журнал"
 
-#: ../bin/drakids:78
-#: ../bin/drakids:97
-#: ../bin/net_applet:665
+#: ../bin/drakids:78 ../bin/drakids:97 ../bin/net_applet:665
 #, c-format
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../bin/drakids:79
-#: ../bin/drakids:88
-#: ../bin/net_applet:666
+#: ../bin/drakids:79 ../bin/drakids:88 ../bin/net_applet:666
 #, c-format
 msgid "Block"
 msgstr "Блокировать"
 
-#: ../bin/drakids:80
-#: ../bin/drakids:89
-#: ../bin/drakids:98
-#: ../bin/drakids:109
-#: ../bin/drakids:122
-#: ../bin/drakids:130
-#: ../bin/draknfs:191
+#: ../bin/drakids:80 ../bin/drakids:89 ../bin/drakids:98 ../bin/drakids:109
+#: ../bin/drakids:122 ../bin/drakids:130 ../bin/draknfs:191
 #: ../bin/net_monitor:120
 #, c-format
 msgid "Close"
@@ -1329,16 +1165,12 @@ msgstr "Разрешённые службы"
 msgid "Clear logs"
 msgstr "Очистить журнал"
 
-#: ../bin/drakids:107
-#: ../bin/drakids:112
-#: ../bin/net_applet:609
+#: ../bin/drakids:107 ../bin/drakids:112 ../bin/net_applet:609
 #, c-format
 msgid "Blacklist"
 msgstr "Чёрный список"
 
-#: ../bin/drakids:108
-#: ../bin/drakids:125
-#: ../bin/net_applet:614
+#: ../bin/drakids:108 ../bin/drakids:125 ../bin/net_applet:614
 #, c-format
 msgid "Whitelist"
 msgstr "Белый список"
@@ -1373,8 +1205,7 @@ msgstr "Атакующий"
 msgid "Attack type"
 msgstr "Тип атаки"
 
-#: ../bin/drakids:250
-#: ../bin/drakids:283
+#: ../bin/drakids:250 ../bin/drakids:283
 #, c-format
 msgid "Service"
 msgstr "Служба"
@@ -1421,8 +1252,12 @@ msgstr "Нужен пароль."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Эта утилита позволяет настроить перехват отказавшего сетевого интерфейса и репликацию файервола."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Эта утилита позволяет настроить перехват отказавшего сетевого интерфейса и "
+"репликацию файервола."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -1444,8 +1279,7 @@ msgstr "Виртуальный адрес"
 msgid "Virtual ID"
 msgstr "Виртуальный ID"
 
-#: ../bin/drakinvictus:110
-#: ../lib/network/netconnect.pm:594
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:594
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -1488,8 +1322,11 @@ msgstr "Новый профиль..."
 
 #: ../bin/draknetprofile:102
 #, c-format
-msgid "Name of the profile to create (the new profile is created as a copy of the current one):"
-msgstr "Название создаваемого профиля (новый профиль создаётся как копия текущего):"
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one):"
+msgstr ""
+"Название создаваемого профиля (новый профиль создаётся как копия текущего):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -1508,8 +1345,12 @@ msgstr "Вы не можете удалить текущий профиль"
 
 #: ../bin/draknetprofile:141
 #, c-format
-msgid "This tool allows to activate an existing network profile, and to manage (clone, delete) profiles."
-msgstr "Эта утилита позволяет вам управлять сетевыми профилями (активировать, копировать, удалять)."
+msgid ""
+"This tool allows to activate an existing network profile, and to manage "
+"(clone, delete) profiles."
+msgstr ""
+"Эта утилита позволяет вам управлять сетевыми профилями (активировать, "
+"копировать, удалять)."
 
 #: ../bin/draknetprofile:141
 #, c-format
@@ -1551,49 +1392,39 @@ msgstr "Без отображения UID пользователей"
 msgid "allow real remote root access"
 msgstr "разрешить реальный удалённый доступ для root"
 
-#: ../bin/draknfs:61
-#: ../bin/draknfs:62
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:174
-#: ../bin/draksambashare:175
+#: ../bin/draknfs:61 ../bin/draknfs:62 ../bin/draknfs:63
+#: ../bin/draksambashare:174 ../bin/draksambashare:175
 #: ../bin/draksambashare:176
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../bin/draknfs:62
-#: ../bin/draksambashare:175
+#: ../bin/draknfs:62 ../bin/draksambashare:175
 #, c-format
 msgid "/_Write conf"
 msgstr "/_Записать конфиг"
 
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:176
+#: ../bin/draknfs:63 ../bin/draksambashare:176
 #, c-format
 msgid "/_Quit"
 msgstr "/_Выход"
 
-#: ../bin/draknfs:63
-#: ../bin/draksambashare:176
+#: ../bin/draknfs:63 ../bin/draksambashare:176
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../bin/draknfs:66
-#: ../bin/draknfs:67
-#: ../bin/draknfs:68
+#: ../bin/draknfs:66 ../bin/draknfs:67 ../bin/draknfs:68
 #, c-format
 msgid "/_NFS Server"
 msgstr "/Сервер _NFS"
 
-#: ../bin/draknfs:67
-#: ../bin/draksambashare:180
+#: ../bin/draknfs:67 ../bin/draksambashare:180
 #, c-format
 msgid "/_Restart"
 msgstr "/_Перезапустить"
 
-#: ../bin/draknfs:68
-#: ../bin/draksambashare:181
+#: ../bin/draknfs:68 ../bin/draksambashare:181
 #, c-format
 msgid "/R_eload"
 msgstr "/Переза_грузить"
@@ -1613,14 +1444,12 @@ msgstr "Перезапускается/перезагружается серве
 msgid "Error Restarting/Reloading NFS server"
 msgstr "Ошибка перезапуска/перезагрузки сервера NFS"
 
-#: ../bin/draknfs:104
-#: ../bin/draksambashare:245
+#: ../bin/draknfs:104 ../bin/draksambashare:245
 #, c-format
 msgid "Directory Selection"
 msgstr "Выбор каталога"
 
-#: ../bin/draknfs:109
-#: ../bin/draksambashare:250
+#: ../bin/draknfs:109 ../bin/draksambashare:250
 #, c-format
 msgid "Should be a directory."
 msgstr "Должен быть каталогом."
@@ -1628,33 +1457,51 @@ msgstr "Должен быть каталогом."
 #: ../bin/draknfs:140
 #, c-format
 msgid ""
-"<span weight=\"bold\">NFS clients</span> may be specified in a number of ways:\n"
+"<span weight=\"bold\">NFS clients</span> may be specified in a number of "
+"ways:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">single host:</span> a host either by an abbreviated name recognized be the resolver, fully qualified domain name, or an IP address\n"
+"<span foreground=\"royalblue3\">single host:</span> a host either by an "
+"abbreviated name recognized be the resolver, fully qualified domain name, or "
+"an IP address\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">netgroups:</span> NIS netgroups may be given as @group.\n"
+"<span foreground=\"royalblue3\">netgroups:</span> NIS netgroups may be given "
+"as @group.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">wildcards:</span> machine names may contain the wildcard characters * and ?. For instance: *.cs.foo.edu  matches all  hosts  in the domain cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">wildcards:</span> machine names may contain "
+"the wildcard characters * and ?. For instance: *.cs.foo.edu  matches all  "
+"hosts  in the domain cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP networks:</span> you can also export directories to all hosts on an IP (sub-)network simultaneously. for example, either `/255.255.252.0' or  `/22'  appended to the network base address result.\n"
+"<span foreground=\"royalblue3\">IP networks:</span> you can also export "
+"directories to all hosts on an IP (sub-)network simultaneously. for example, "
+"either `/255.255.252.0' or  `/22'  appended to the network base address "
+"result.\n"
 msgstr ""
-"<span weight=\"bold\">NFS клиенты</span> могут указывать номер такими способами:\n"
+"<span weight=\"bold\">NFS клиенты</span> могут указывать номер такими "
+"способами:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">одиночный хост:</span> хост в виде имени, которое может быть преобразовано сервером, то есть полное доменное имя, или просто IP адрес\n"
+"<span foreground=\"royalblue3\">одиночный хост:</span> хост в виде имени, "
+"которое может быть преобразовано сервером, то есть полное доменное имя, или "
+"просто IP адрес\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">сетевые группы(netgroups):</span>сетевые группы NIS можно ввести как @group.\n"
+"<span foreground=\"royalblue3\">сетевые группы(netgroups):</span>сетевые "
+"группы NIS можно ввести как @group.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">шаблоны (wildcards):</span> имена машин могут содержать символы шаблона * и ?. Например: *.cs.foo.edu  соответствует всем хостам в домене cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">шаблоны (wildcards):</span> имена машин "
+"могут содержать символы шаблона * и ?. Например: *.cs.foo.edu  соответствует "
+"всем хостам в домене cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP сети:</span> вы также можете экспортировать каталоги на все хосты локальной (под)сети одновременно. Например, `/255.255.252.0' или  `/22' добавляется в результате к базовому адресу сети.\n"
+"<span foreground=\"royalblue3\">IP сети:</span> вы также можете "
+"экспортировать каталоги на все хосты локальной (под)сети одновременно. "
+"Например, `/255.255.252.0' или  `/22' добавляется в результате к базовому "
+"адресу сети.\n"
 
 #: ../bin/draknfs:155
 #, c-format
@@ -1662,30 +1509,46 @@ msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">map root user as anonymous:</span> map requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
+"<span foreground=\"royalblue3\">map root user as anonymous:</span> map "
+"requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">allow real remote root access:</span> turn off root squashing. This option is mainly useful for diskless clients (no_root_squash).\n"
+"<span foreground=\"royalblue3\">allow real remote root access:</span> turn "
+"off root squashing. This option is mainly useful for diskless clients "
+"(no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map all uids and gids to the anonymous  user (all_squash). Useful for NFS-exported public FTP directories, news spool directories, etc. The opposite option is no user UID mapping (no_all_squash), which is the default setting.\n"
+"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map "
+"all uids and gids to the anonymous  user (all_squash). Useful for NFS-"
+"exported public FTP directories, news spool directories, etc. The opposite "
+"option is no user UID mapping (no_all_squash), which is the default "
+"setting.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set the uid and gid of the anonymous account.\n"
+"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set "
+"the uid and gid of the anonymous account.\n"
 msgstr ""
 "<span weight=\"bold\">Параметры ID пользователя</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">отображать пользователя root как anonymous:</span> отображать запросы с uid/gid 0 на anonymous uid/gid (root_squash).\n"
+"<span foreground=\"royalblue3\">отображать пользователя root как anonymous:</"
+"span> отображать запросы с uid/gid 0 на anonymous uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">разрешить реальный доступ для root:</span> выключить root squashing. Эта опция в основном полезна для бездисковых клиентов (no_root_squash).\n"
+"<span foreground=\"royalblue3\">разрешить реальный доступ для root:</span> "
+"выключить root squashing. Эта опция в основном полезна для бездисковых "
+"клиентов (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">отображать всех пользователей как anonymous:</span> отображать все uid-ы and gid-ы как anonymous пользователь (all_squash). Полезно для экспортируемых по NFS общедоступных FTP каталогов, новых спул-каталогов и т.д. Обратная опция это не делать отображения UID пользователей (no_all_squash), что является установкой по умолчанию.\n"
+"<span foreground=\"royalblue3\">отображать всех пользователей как anonymous:"
+"</span> отображать все uid-ы and gid-ы как anonymous пользователь "
+"(all_squash). Полезно для экспортируемых по NFS общедоступных FTP каталогов, "
+"новых спул-каталогов и т.д. Обратная опция это не делать отображения UID "
+"пользователей (no_all_squash), что является установкой по умолчанию.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid и anongid:</span> однозначная установка uid и gid на учётную запись anonymous.\n"
+"<span foreground=\"royalblue3\">anonuid и anongid:</span> однозначная "
+"установка uid и gid на учётную запись anonymous.\n"
 
 #: ../bin/draknfs:171
 #, c-format
@@ -1714,27 +1577,51 @@ msgstr "Дополнительные параметры"
 
 #: ../bin/draknfs:177
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> this option requires that requests originate on an internet port less than IPPORT_RESERVED (1024). This option is on by default."
-msgstr "<span foreground=\"royalblue3\">%s</span> эта опция требует чтобы запросы исходили от интернет порта меньше чем IPPORT_RESERVED (1024). Является опцией по умолчанию."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> this option requires that requests "
+"originate on an internet port less than IPPORT_RESERVED (1024). This option "
+"is on by default."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> эта опция требует чтобы запросы "
+"исходили от интернет порта меньше чем IPPORT_RESERVED (1024). Является "
+"опцией по умолчанию."
 
 #: ../bin/draknfs:178
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> allow either only read or both read and write requests on this NFS volume. The default is to disallow any request which changes the filesystem. This can also be made explicit by using this option."
-msgstr "<span foreground=\"royalblue3\">%s</span> позволяет чтение либо чтение и запись на раздел NFS. По умолчанию все запросы на изменение файловой системы отключены. Этой опцией можно это сделать однозначно."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> allow either only read or both "
+"read and write requests on this NFS volume. The default is to disallow any "
+"request which changes the filesystem. This can also be made explicit by "
+"using this option."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> позволяет чтение либо чтение и "
+"запись на раздел NFS. По умолчанию все запросы на изменение файловой системы "
+"отключены. Этой опцией можно это сделать однозначно."
 
 #: ../bin/draknfs:179
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> disallows the NFS server to violate the NFS protocol and to reply to requests before any changes made by these requests have been committed to stable storage (e.g. disc drive)."
-msgstr "<span foreground=\"royalblue3\">%s</span> запрещает NFS серверу нарушать NFS протокол и ответы на запросы перед любыми изменениями должны быть сохранены на стабильное хранилище (т.е. диск)."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> disallows the NFS server to "
+"violate the NFS protocol and to reply to requests before any changes made by "
+"these requests have been committed to stable storage (e.g. disc drive)."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> запрещает NFS серверу нарушать NFS "
+"протокол и ответы на запросы перед любыми изменениями должны быть сохранены "
+"на стабильное хранилище (т.е. диск)."
 
 #: ../bin/draknfs:180
 #, c-format
-msgid "<span foreground=\"royalblue3\">%s</span> enable subtree checking which can help improve security in some cases, but can decrease reliability. See exports(5) man page for more details."
-msgstr "<span foreground=\"royalblue3\">%s</span> позволяет проверять дерево нижнего уровня, что в некоторых случаях может помочь повысить безопасность, но также может снизить надёжность. Дополнительную информацию см. на странице руководства exports(5)."
+msgid ""
+"<span foreground=\"royalblue3\">%s</span> enable subtree checking which can "
+"help improve security in some cases, but can decrease reliability. See "
+"exports(5) man page for more details."
+msgstr ""
+"<span foreground=\"royalblue3\">%s</span> позволяет проверять дерево нижнего "
+"уровня, что в некоторых случаях может помочь повысить безопасность, но также "
+"может снизить надёжность. Дополнительную информацию см. на странице "
+"руководства exports(5)."
 
-#: ../bin/draknfs:185
-#: ../bin/draksambashare:632
-#: ../bin/draksambashare:799
+#: ../bin/draknfs:185 ../bin/draksambashare:632 ../bin/draksambashare:799
 #, c-format
 msgid "Information"
 msgstr "Информация"
@@ -1754,8 +1641,7 @@ msgstr "Запись Draknfs"
 msgid "Please add an NFS share to be able to modify it."
 msgstr "Добавьте ресурс NFS, чтобы его можно было изменить."
 
-#: ../bin/draknfs:353
-#: ../bin/draksambashare:607
+#: ../bin/draknfs:353 ../bin/draksambashare:607
 #, c-format
 msgid "Advanced options"
 msgstr "Расширенные параметры"
@@ -1765,9 +1651,7 @@ msgstr "Расширенные параметры"
 msgid "NFS directory"
 msgstr "Каталог NFS"
 
-#: ../bin/draknfs:369
-#: ../bin/draksambashare:381
-#: ../bin/draksambashare:597
+#: ../bin/draknfs:369 ../bin/draksambashare:381 ../bin/draksambashare:597
 #: ../bin/draksambashare:776
 #, c-format
 msgid "Directory:"
@@ -1838,9 +1722,7 @@ msgstr "Общие параметры"
 msgid "Custom Options"
 msgstr "Дополнительные параметры"
 
-#: ../bin/draknfs:509
-#: ../bin/draksambashare:397
-#: ../bin/draksambashare:634
+#: ../bin/draknfs:509 ../bin/draksambashare:397 ../bin/draksambashare:634
 #: ../bin/draksambashare:801
 #, c-format
 msgid "Please enter a directory to share."
@@ -1886,27 +1768,23 @@ msgstr "Вам нужно выйти и зайти снова чтобы изм�
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: ../bin/draksambashare:71
-#: ../bin/draksambashare:99
+#: ../bin/draksambashare:71 ../bin/draksambashare:99
 #, c-format
 msgid "Share name"
 msgstr "Имя общего ресурса"
 
-#: ../bin/draksambashare:72
-#: ../bin/draksambashare:100
+#: ../bin/draksambashare:72 ../bin/draksambashare:100
 #, c-format
 msgid "Share directory"
 msgstr "Общий каталог"
 
-#: ../bin/draksambashare:73
-#: ../bin/draksambashare:101
+#: ../bin/draksambashare:73 ../bin/draksambashare:101
 #: ../bin/draksambashare:118
 #, c-format
 msgid "Comment"
 msgstr "Комментарий"
 
-#: ../bin/draksambashare:74
-#: ../bin/draksambashare:119
+#: ../bin/draksambashare:74 ../bin/draksambashare:119
 #, c-format
 msgid "Browseable"
 msgstr "Можно просматривать"
@@ -1916,20 +1794,17 @@ msgstr "Можно просматривать"
 msgid "Public"
 msgstr "Общедоступный"
 
-#: ../bin/draksambashare:76
-#: ../bin/draksambashare:124
+#: ../bin/draksambashare:76 ../bin/draksambashare:124
 #, c-format
 msgid "Writable"
 msgstr "Доступен на запись"
 
-#: ../bin/draksambashare:77
-#: ../bin/draksambashare:165
+#: ../bin/draksambashare:77 ../bin/draksambashare:165
 #, c-format
 msgid "Create mask"
 msgstr "Создать маску"
 
-#: ../bin/draksambashare:78
-#: ../bin/draksambashare:166
+#: ../bin/draksambashare:78 ../bin/draksambashare:166
 #, c-format
 msgid "Directory mask"
 msgstr "Маска каталога"
@@ -1939,21 +1814,18 @@ msgstr "Маска каталога"
 msgid "Read list"
 msgstr "Чтение списка"
 
-#: ../bin/draksambashare:80
-#: ../bin/draksambashare:125
+#: ../bin/draksambashare:80 ../bin/draksambashare:125
 #: ../bin/draksambashare:611
 #, c-format
 msgid "Write list"
 msgstr "Запись списка"
 
-#: ../bin/draksambashare:81
-#: ../bin/draksambashare:157
+#: ../bin/draksambashare:81 ../bin/draksambashare:157
 #, c-format
 msgid "Admin users"
 msgstr "Управление пользователями"
 
-#: ../bin/draksambashare:82
-#: ../bin/draksambashare:158
+#: ../bin/draksambashare:82 ../bin/draksambashare:158
 #, c-format
 msgid "Valid users"
 msgstr "Проверка пользователей"
@@ -1963,20 +1835,17 @@ msgstr "Проверка пользователей"
 msgid "Inherit Permissions"
 msgstr "Передача прав"
 
-#: ../bin/draksambashare:84
-#: ../bin/draksambashare:159
+#: ../bin/draksambashare:84 ../bin/draksambashare:159
 #, c-format
 msgid "Hide dot files"
 msgstr "Скрыть файлы с точкой"
 
-#: ../bin/draksambashare:85
-#: ../bin/draksambashare:160
+#: ../bin/draksambashare:85 ../bin/draksambashare:160
 #, c-format
 msgid "Hide files"
 msgstr "Скрыть файлы"
 
-#: ../bin/draksambashare:86
-#: ../bin/draksambashare:164
+#: ../bin/draksambashare:86 ../bin/draksambashare:164
 #, c-format
 msgid "Preserve case"
 msgstr "Сохранять регистр"
@@ -1991,8 +1860,7 @@ msgstr "Принудительно создавать режим"
 msgid "Force group"
 msgstr "Навязывать группу"
 
-#: ../bin/draksambashare:89
-#: ../bin/draksambashare:163
+#: ../bin/draksambashare:89 ../bin/draksambashare:163
 #, c-format
 msgid "Default case"
 msgstr "Регистр по умолчанию"
@@ -2007,8 +1875,7 @@ msgstr "Имя принтера"
 msgid "Path"
 msgstr "Путь"
 
-#: ../bin/draksambashare:120
-#: ../bin/draksambashare:603
+#: ../bin/draksambashare:120 ../bin/draksambashare:603
 #, c-format
 msgid "Printable"
 msgstr "Доступный для печати"
@@ -2028,8 +1895,7 @@ msgstr "Команда LPQ"
 msgid "Guest ok"
 msgstr "Гостям можно"
 
-#: ../bin/draksambashare:126
-#: ../bin/draksambashare:167
+#: ../bin/draksambashare:126 ../bin/draksambashare:167
 #: ../bin/draksambashare:612
 #, c-format
 msgid "Inherit permissions"
@@ -2070,10 +1936,8 @@ msgstr "Форсировать группу"
 msgid "Force create group"
 msgstr "Принудительно создать группу"
 
-#: ../bin/draksambashare:178
-#: ../bin/draksambashare:179
-#: ../bin/draksambashare:180
-#: ../bin/draksambashare:181
+#: ../bin/draksambashare:178 ../bin/draksambashare:179
+#: ../bin/draksambashare:180 ../bin/draksambashare:181
 #, c-format
 msgid "/_Samba Server"
 msgstr "/Сервер _Samba"
@@ -2093,8 +1957,7 @@ msgstr "/_Справка"
 msgid "/Samba Documentation"
 msgstr "/Документация по Samba"
 
-#: ../bin/draksambashare:189
-#: ../bin/draksambashare:190
+#: ../bin/draksambashare:189 ../bin/draksambashare:190
 #, c-format
 msgid "/_About"
 msgstr "/_О программе"
@@ -2145,8 +2008,7 @@ msgstr "Перезапускается/перезагружается серве
 msgid "Error Restarting/Reloading Samba server"
 msgstr "Ошибка перезапуска/перезагрузки сервера Samba..."
 
-#: ../bin/draksambashare:369
-#: ../bin/draksambashare:576
+#: ../bin/draksambashare:369 ../bin/draksambashare:576
 #: ../bin/draksambashare:697
 #, c-format
 msgid "Open"
@@ -2167,8 +2029,7 @@ msgstr "Добавить ресурс"
 msgid "Name of the share:"
 msgstr "Название общего ресурса:"
 
-#: ../bin/draksambashare:380
-#: ../bin/draksambashare:596
+#: ../bin/draksambashare:380 ../bin/draksambashare:596
 #: ../bin/draksambashare:777
 #, c-format
 msgid "Comment:"
@@ -2176,16 +2037,19 @@ msgstr "Комментарий:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Ресурс с таким именем уже существует или название не указано. Пожалуйста, выберите другое имя."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Ресурс с таким именем уже существует или название не указано. Пожалуйста, "
+"выберите другое имя."
 
 #: ../bin/draksambashare:400
 #, c-format
 msgid "Can't create the directory, please enter a correct path."
 msgstr "Невозможно создать каталог. Пожалуйста, укажите корректный путь."
 
-#: ../bin/draksambashare:403
-#: ../bin/draksambashare:632
+#: ../bin/draksambashare:403 ../bin/draksambashare:632
 #: ../bin/draksambashare:799
 #, c-format
 msgid "Please enter a Comment for this share."
@@ -2208,8 +2072,11 @@ msgstr "Добавить специальный ресурс печати"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Целью этого мастера является простое создание нового специального ресурса печати Samba."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Целью этого мастера является простое создание нового специального ресурса "
+"печати Samba."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -2221,8 +2088,7 @@ msgstr "Генератор PDF уже существует."
 msgid "Printers and print$ already exist."
 msgstr "Printers и print$ уже существуют."
 
-#: ../bin/draksambashare:529
-#: ../bin/draksambashare:1199
+#: ../bin/draksambashare:529 ../bin/draksambashare:1199
 #, c-format
 msgid "Congratulations"
 msgstr "Поздравляем"
@@ -2232,12 +2098,7 @@ msgstr "Поздравляем"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Мастер успешно добавил ресурс печати Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Не удалось добавить принтеры."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Добавьте или выберите ресурс печати Samba, чтобы изменить его."
@@ -2257,14 +2118,12 @@ msgstr "Ресурс печати"
 msgid "Printer name:"
 msgstr "Имя принтера:"
 
-#: ../bin/draksambashare:601
-#: ../bin/draksambashare:782
+#: ../bin/draksambashare:601 ../bin/draksambashare:782
 #, c-format
 msgid "Writable:"
 msgstr "Разрешена запись:"
 
-#: ../bin/draksambashare:602
-#: ../bin/draksambashare:783
+#: ../bin/draksambashare:602 ../bin/draksambashare:783
 #, c-format
 msgid "Browseable:"
 msgstr "Разрешён просмотр:"
@@ -2351,8 +2210,11 @@ msgstr "Общедоступный:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Маска создания, режим создания и маска каталога должны быть числами. Пример: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Маска создания, режим создания и маска каталога должны быть числами. Пример: "
+"0755."
 
 #: ../bin/draksambashare:812
 #, c-format
@@ -2401,8 +2263,12 @@ msgstr "Мастер настройки сервера Samba"
 
 #: ../bin/draksambashare:1066
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Сервер Samba выполняет роль файлового сервера и сервера печати для рабочих станций под управлением отличных от Linux систем."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Сервер Samba выполняет роль файлового сервера и сервера печати для рабочих "
+"станций под управлением отличных от Linux систем."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2411,18 +2277,29 @@ msgstr "PDC-сервер: первичный контроллер домена"
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Сервер, выполняющий роль PDC, отвечает за авторизацию Windows-систем в домене."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Сервер, выполняющий роль PDC, отвечает за авторизацию Windows-систем в "
+"домене."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "В случае установки единственного сервера для работы с паролями можно использовать утилиты smbpasswd или tdbsam."
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"В случае установки единственного сервера для работы с паролями можно "
+"использовать утилиты smbpasswd или tdbsam."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Domain master = yes, causes the server to register the NetBIOS name <pdc name>. This name will be recognized by other servers."
-msgstr "\"Domain master = yes\" означает, что сервер зарегистрирует для себя NetBIOS-имя в виде <pdc name>. Это имя будет опознаваться другими серверами."
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>. This name will be recognized by other servers."
+msgstr ""
+"\"Domain master = yes\" означает, что сервер зарегистрирует для себя NetBIOS-"
+"имя в виде <pdc name>. Это имя будет опознаваться другими серверами."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2446,8 +2323,17 @@ msgstr "Уровень ОС:"
 
 #: ../bin/draksambashare:1101
 #, c-format
-msgid "The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34"
-msgstr "Уровень ОС определяет вероятность выбора сервера рабочей станцией при поиске в локальной сети. Чтобы Samba-сервер выиграл в этом выборе, установите значение выше, чем самое высокое значение операционной системы, присутствующей в сети, например, os level = 34."
+msgid ""
+"The global os level option dictates the operating system level at which "
+"Samba will masquerade during a browser election. If you wish to have Samba "
+"win an election and become the master browser, you can set the level above "
+"that of the operating system on your network with the highest current value. "
+"ie: os level = 34"
+msgstr ""
+"Уровень ОС определяет вероятность выбора сервера рабочей станцией при поиске "
+"в локальной сети. Чтобы Samba-сервер выиграл в этом выборе, установите "
+"значение выше, чем самое высокое значение операционной системы, "
+"присутствующей в сети, например, os level = 34."
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2462,10 +2348,11 @@ msgstr "Рабочая группа"
 #: ../bin/draksambashare:1112
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Для Samba-сервера необходимо указать рабочую группу Windows, которую он будет обслуживать."
+msgstr ""
+"Для Samba-сервера необходимо указать рабочую группу Windows, которую он "
+"будет обслуживать."
 
-#: ../bin/draksambashare:1119
-#: ../bin/draksambashare:1183
+#: ../bin/draksambashare:1119 ../bin/draksambashare:1183
 #, c-format
 msgid "Workgroup:"
 msgstr "Рабочая группа:"
@@ -2480,26 +2367,38 @@ msgstr "Netbios-имя:"
 msgid "The Workgroup is wrong."
 msgstr "Недопустимая рабочая группа."
 
-#: ../bin/draksambashare:1131
-#: ../bin/draksambashare:1141
+#: ../bin/draksambashare:1131 ../bin/draksambashare:1141
 #, c-format
 msgid "Security mode"
 msgstr "Режим безопасности"
 
 #: ../bin/draksambashare:1131
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "Уровень пользователя: сразу после согласования протоколов клиент отправляет серверу запрос для установки сеанса. В этом запросе передаются имя пользователя и пароль."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"Уровень пользователя: сразу после согласования протоколов клиент отправляет "
+"серверу запрос для установки сеанса. В этом запросе передаются имя "
+"пользователя и пароль."
 
 #: ../bin/draksambashare:1131
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Уровень сервера: клиент должен проходить аутентификацию для каждого общего ресурса."
+msgstr ""
+"Уровень сервера: клиент должен проходить аутентификацию для каждого общего "
+"ресурса."
 
 #: ../bin/draksambashare:1131
 #, c-format
-msgid "Domain level: provides a mechanism for storing all user and group accounts in a central, shared, account repository. The centralized account repository is shared between domain (security) controllers."
-msgstr "Уровень домена: учётные записи пользоваелей и групп хранятся в едином общем репозитории. Этот централизованный репозиторий используется одновременно несколькими доменами."
+msgid ""
+"Domain level: provides a mechanism for storing all user and group accounts "
+"in a central, shared, account repository. The centralized account repository "
+"is shared between domain (security) controllers."
+msgstr ""
+"Уровень домена: учётные записи пользоваелей и групп хранятся в едином общем "
+"репозитории. Этот централизованный репозиторий используется одновременно "
+"несколькими доменами."
 
 #: ../bin/draksambashare:1142
 #, c-format
@@ -2513,8 +2412,12 @@ msgstr "Описание сервера"
 
 #: ../bin/draksambashare:1147
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "Описание будет показано в списке рабочих станций сети напротив названия сервера."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Описание будет показано в списке рабочих станций сети напротив названия "
+"сервера."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2533,21 +2436,26 @@ msgstr "Журнал Samba"
 
 #: ../bin/draksambashare:1163
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Файл журнала: используйте файл.%m для отдельного журанала для каждой подключившейся машины"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Файл журнала: используйте файл.%m для отдельного журанала для каждой "
+"подключившейся машины"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Уровень подробности: определяет степень информативности сообщений в журнале (0 <= уровень  <= 10)"
+msgstr ""
+"Уровень подробности: определяет степень информативности сообщений в журнале "
+"(0 <= уровень  <= 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr "Максимальный размер файлов журнала (в КБ)."
 
-#: ../bin/draksambashare:1170
-#: ../bin/draksambashare:1185
+#: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
 msgid "Log file:"
 msgstr "Файл журнала:"
@@ -2569,13 +2477,22 @@ msgstr "Мастер собрал следующие параметры для �
 
 #: ../bin/draksambashare:1177
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Чтобы принять эти значения и настроить сервер, нажмите кнопку «Далее». Чтобы исправить параметры, нажмите кнопку «Назад»."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Чтобы принять эти значения и настроить сервер, нажмите кнопку «Далее». Чтобы "
+"исправить параметры, нажмите кнопку «Назад»."
 
 #: ../bin/draksambashare:1177
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Если ранее уже были настроены общие ресурсы, они автоматически появятся в этой конфигурации. Чтобы настроить общие ресурсы, запустите из консоли 'drakwizard sambashare'."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Если ранее уже были настроены общие ресурсы, они автоматически появятся в "
+"этой конфигурации. Чтобы настроить общие ресурсы, запустите из консоли "
+"'drakwizard sambashare'."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2592,12 +2509,7 @@ msgstr "Описание сервера:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Мастер успешно настроил Samba-сервер."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Не удалось настроить Samba-сервер."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Мастер настройки Samba-сервера неожиданно завершил свою работу:"
@@ -2662,7 +2574,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Пользователи Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Не удалось настроить Samba-сервер."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba управляет общими ресурсами Samba"
@@ -2696,15 +2620,12 @@ msgstr ""
 msgid "disable"
 msgstr "отключить"
 
-#: ../bin/drakvpn-old:93
-#: ../bin/drakvpn-old:119
+#: ../bin/drakvpn-old:93 ../bin/drakvpn-old:119
 #, c-format
 msgid "reconfigure"
 msgstr "перенастроить"
 
-#: ../bin/drakvpn-old:93
-#: ../bin/drakvpn-old:119
-#: ../bin/drakvpn-old:432
+#: ../bin/drakvpn-old:93 ../bin/drakvpn-old:119 ../bin/drakvpn-old:432
 #, c-format
 msgid "dismiss"
 msgstr "отменить"
@@ -2753,8 +2674,7 @@ msgstr "Включается VPN..."
 msgid "The VPN connection is now enabled."
 msgstr "VPN соединение теперь включено."
 
-#: ../bin/drakvpn-old:147
-#: ../bin/drakvpn-old:164
+#: ../bin/drakvpn-old:147 ../bin/drakvpn-old:164
 #, c-format
 msgid "Simple VPN setup."
 msgstr "Упрощённая настройка VPN."
@@ -2783,7 +2703,8 @@ msgstr ""
 "Сообщение через Интернет шифруется. Локальные и удалённые компьютеры видят\n"
 "друг друга как будто они в одной и той же сети.\n"
 "\n"
-"Прежде чем продолжать, проверьте что у вас уже настроен доступ в Сеть/Интернет\n"
+"Прежде чем продолжать, проверьте что у вас уже настроен доступ в Сеть/"
+"Интернет\n"
 "с помощью drakconnect."
 
 #: ../bin/drakvpn-old:165
@@ -2852,8 +2773,7 @@ msgstr ""
 "\n"
 "Что будем настраивать?\n"
 
-#: ../bin/drakvpn-old:245
-#: ../bin/drakvpn-old:382
+#: ../bin/drakvpn-old:245 ../bin/drakvpn-old:382
 #, c-format
 msgid "%s entries"
 msgstr "%s записей"
@@ -2881,29 +2801,24 @@ msgstr ""
 "\n"
 "Что будем делать ?\n"
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid ""
 "_:display here is a verb\n"
 "Display"
 msgstr "Отобразить"
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Edit"
 msgstr "Редактировать"
 
-#: ../bin/drakvpn-old:253
-#: ../bin/drakvpn-old:391
+#: ../bin/drakvpn-old:253 ../bin/drakvpn-old:391
 #, c-format
 msgid "Commit"
 msgstr "Принять"
 
-#: ../bin/drakvpn-old:267
-#: ../bin/drakvpn-old:271
-#: ../bin/drakvpn-old:406
+#: ../bin/drakvpn-old:267 ../bin/drakvpn-old:271 ../bin/drakvpn-old:406
 #: ../bin/drakvpn-old:410
 #, c-format
 msgid ""
@@ -2941,8 +2856,7 @@ msgstr ""
 "\n"
 "Когда завершите, нажмите продолжить, чтобы записать данные.\n"
 
-#: ../bin/drakvpn-old:333
-#: ../bin/drakvpn-old:523
+#: ../bin/drakvpn-old:333 ../bin/drakvpn-old:523
 #, c-format
 msgid "Edit section"
 msgstr "Редактировать секцию"
@@ -2960,9 +2874,7 @@ msgstr ""
 "Выберите здесь что именно будете редактировать и\n"
 "нажмите далее.\n"
 
-#: ../bin/drakvpn-old:337
-#: ../bin/drakvpn-old:357
-#: ../bin/drakvpn-old:528
+#: ../bin/drakvpn-old:337 ../bin/drakvpn-old:357 ../bin/drakvpn-old:528
 #: ../bin/drakvpn-old:574
 #, c-format
 msgid "Section names"
@@ -2983,14 +2895,12 @@ msgstr ""
 "\n"
 "Когда закончите, нажмите продолжить, чтобы записать данные.\n"
 
-#: ../bin/drakvpn-old:353
-#: ../bin/drakvpn-old:570
+#: ../bin/drakvpn-old:353 ../bin/drakvpn-old:570
 #, c-format
 msgid "Remove section"
 msgstr "Удалить секцию"
 
-#: ../bin/drakvpn-old:354
-#: ../bin/drakvpn-old:571
+#: ../bin/drakvpn-old:354 ../bin/drakvpn-old:571
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -3145,8 +3055,7 @@ msgstr ""
 "идентификаторов и разделяемый секретный ключ, которые используются\n"
 "в методе аутентификации Pre-shared key в фазе 1."
 
-#: ../bin/drakvpn-old:467
-#: ../bin/drakvpn-old:560
+#: ../bin/drakvpn-old:467 ../bin/drakvpn-old:560
 #, c-format
 msgid "real file"
 msgstr "реальный файл"
@@ -3535,7 +3444,8 @@ msgid ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n"
+"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
+"'hour'.\n"
 msgstr ""
 "определяет lifetime определённого времени которое будет\n"
 "предложено в переговорах phase 1. Будет приниматься любое\n"
@@ -3552,10 +3462,10 @@ msgstr ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"Итак, здесь единицы lifetime это 'min', 'min', 'sec', 'sec', 'sec' и  'hour'.\n"
+"Итак, здесь единицы lifetime это 'min', 'min', 'sec', 'sec', 'sec' и  "
+"'hour'.\n"
 
-#: ../bin/drakvpn-old:728
-#: ../bin/drakvpn-old:813
+#: ../bin/drakvpn-old:728 ../bin/drakvpn-old:813
 #, c-format
 msgid "Encryption algorithm"
 msgstr "Алгоритм шифрования"
@@ -3632,16 +3542,12 @@ msgstr ""
 msgid "Generate policy"
 msgstr "Создать политику"
 
-#: ../bin/drakvpn-old:758
-#: ../bin/drakvpn-old:774
-#: ../bin/drakvpn-old:787
+#: ../bin/drakvpn-old:758 ../bin/drakvpn-old:774 ../bin/drakvpn-old:787
 #, c-format
 msgid "off"
 msgstr "выключить"
 
-#: ../bin/drakvpn-old:758
-#: ../bin/drakvpn-old:774
-#: ../bin/drakvpn-old:787
+#: ../bin/drakvpn-old:758 ../bin/drakvpn-old:774 ../bin/drakvpn-old:787
 #, c-format
 msgid "on"
 msgstr "включить"
@@ -3863,8 +3769,7 @@ msgstr "Диапазон IP назначения"
 msgid "Upper-layer protocol"
 msgstr "Upper-layer протокол"
 
-#: ../bin/drakvpn-old:833
-#: ../bin/drakvpn-old:840
+#: ../bin/drakvpn-old:833 ../bin/drakvpn-old:840
 #, c-format
 msgid "any"
 msgstr "любой"
@@ -3964,14 +3869,12 @@ msgstr "Подключён к %s (тип связи: %d %%)"
 msgid "Network is down on interface %s."
 msgstr "Сеть опущена на интерфейсе %s."
 
-#: ../bin/net_applet:75
-#: ../bin/net_monitor:468
+#: ../bin/net_applet:75 ../bin/net_monitor:468
 #, c-format
 msgid "Connect %s"
 msgstr "Подключить %s"
 
-#: ../bin/net_applet:76
-#: ../bin/net_monitor:468
+#: ../bin/net_applet:76 ../bin/net_monitor:468
 #, c-format
 msgid "Disconnect %s"
 msgstr "Отключить %s"
@@ -4001,9 +3904,7 @@ msgstr "Настроить сеть"
 msgid "Watched interface"
 msgstr "Наблюдаемые интерфейсы"
 
-#: ../bin/net_applet:88
-#: ../bin/net_applet:89
-#: ../bin/net_applet:91
+#: ../bin/net_applet:88 ../bin/net_applet:89 ../bin/net_applet:91
 #, c-format
 msgid "Auto-detect"
 msgstr "Автоопределение"
@@ -4018,12 +3919,9 @@ msgstr "Активные интерфейсы"
 msgid "Profiles"
 msgstr "Профили"
 
-#: ../bin/net_applet:130
-#: ../lib/network/connection.pm:170
-#: ../lib/network/drakvpn.pm:62
-#: ../lib/network/vpn/openvpn.pm:365
-#: ../lib/network/vpn/openvpn.pm:379
-#: ../lib/network/vpn/openvpn.pm:390
+#: ../bin/net_applet:130 ../lib/network/connection.pm:170
+#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
+#: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, c-format
 msgid "VPN connection"
 msgstr "VPN-подключение"
@@ -4053,8 +3951,7 @@ msgstr "Всегда запускать при старте"
 msgid "Wireless networks"
 msgstr "Беспроводные сети"
 
-#: ../bin/net_applet:489
-#: ../bin/net_monitor:96
+#: ../bin/net_applet:489 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "Настройки"
@@ -4129,8 +4026,7 @@ msgstr "Всегда заносить в чёрный список (больше
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../bin/net_applet:637
-#: ../bin/net_applet:650
+#: ../bin/net_applet:637 ../bin/net_applet:650
 #, c-format
 msgid "Interactive Firewall: new service"
 msgstr "Интерактивный файервол: новая служба"
@@ -4145,8 +4041,7 @@ msgstr "Хотите разрешить эту службу?"
 msgid "Remember this answer"
 msgstr "Запомнить этот ответ"
 
-#: ../bin/net_monitor:60
-#: ../bin/net_monitor:65
+#: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, c-format
 msgid "Network Monitoring"
 msgstr "Мониторинг сети"
@@ -4175,9 +4070,7 @@ msgstr ""
 "Скорость\n"
 "отправки:"
 
-#: ../bin/net_monitor:105
-#: ../bin/net_monitor:106
-#: ../bin/net_monitor:111
+#: ../bin/net_monitor:105 ../bin/net_monitor:106 ../bin/net_monitor:111
 #, c-format
 msgid "unknown"
 msgstr "неопределенный"
@@ -4210,14 +4103,12 @@ msgstr "Использовать одинаковую шкалу для прин
 msgid "Wait please, testing your connection..."
 msgstr "Подождите, пожалуйста. Идёт тестирование соединения..."
 
-#: ../bin/net_monitor:185
-#: ../bin/net_monitor:198
+#: ../bin/net_monitor:185 ../bin/net_monitor:198
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Разрывается подключение к Интернету "
 
-#: ../bin/net_monitor:185
-#: ../bin/net_monitor:198
+#: ../bin/net_monitor:185 ../bin/net_monitor:198
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Идёт подключение к Интернету "
@@ -4251,14 +4142,12 @@ msgstr ""
 msgid "Color configuration"
 msgstr "Настройка цвета"
 
-#: ../bin/net_monitor:395
-#: ../bin/net_monitor:407
+#: ../bin/net_monitor:395 ../bin/net_monitor:407
 #, c-format
 msgid "sent: "
 msgstr "отправлено: "
 
-#: ../bin/net_monitor:398
-#: ../bin/net_monitor:411
+#: ../bin/net_monitor:398 ../bin/net_monitor:411
 #, c-format
 msgid "received: "
 msgstr "получено: "
@@ -4275,8 +4164,12 @@ msgstr "Локальный показатель"
 
 #: ../bin/net_monitor:461
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Предупреждение: было обнаружено другое подключение к Интернету, возможно использующее вашу сеть"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Предупреждение: было обнаружено другое подключение к Интернету, возможно "
+"использующее вашу сеть"
 
 #: ../bin/net_monitor:472
 #, c-format
@@ -4303,12 +4196,9 @@ msgstr "Параметры доступа"
 msgid "Address settings"
 msgstr "Настройки адреса"
 
-#: ../lib/network/connection.pm:172
-#: ../lib/network/connection/cable.pm:44
-#: ../lib/network/connection/wireless.pm:43
-#: ../lib/network/vpn/openvpn.pm:127
-#: ../lib/network/vpn/openvpn.pm:171
-#: ../lib/network/vpn/openvpn.pm:339
+#: ../lib/network/connection.pm:172 ../lib/network/connection/cable.pm:44
+#: ../lib/network/connection/wireless.pm:43 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "Отсутствует"
@@ -4328,8 +4218,7 @@ msgstr "Устанавливать соединение при загрузке"
 msgid "Link detected on interface %s"
 msgstr "На интерфейсе %s обнаружен линк"
 
-#: ../lib/network/connection.pm:252
-#: ../lib/network/connection/ethernet.pm:274
+#: ../lib/network/connection.pm:252 ../lib/network/connection/ethernet.pm:274
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "На интерфейсе %s потерян линк"
@@ -4392,7 +4281,8 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Вы ввели неверный PIN-код.\n"
-"При многократном вводе неверного PIN-кода ваша SIM-карта может быть заблокирована!"
+"При многократном вводе неверного PIN-кода ваша SIM-карта может быть "
+"заблокирована!"
 
 #: ../lib/network/connection/dvb.pm:12
 #, c-format
@@ -4427,10 +4317,11 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:53
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Невозможно найти сетевой интерфейс для выбранного устройства (используя драйвер %s)."
+msgstr ""
+"Невозможно найти сетевой интерфейс для выбранного устройства (используя "
+"драйвер %s)."
 
-#: ../lib/network/connection/ethernet.pm:61
-#: ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:61 ../lib/network/vpn/openvpn.pm:207
 #, c-format
 msgid "Manual configuration"
 msgstr "Ручная настройка"
@@ -4521,37 +4412,30 @@ msgstr "Не удалось получить сетевой адрес на ин
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:153
-#: ../lib/network/netconnect.pm:197
-#: ../lib/network/netconnect.pm:200
-#: ../lib/network/netconnect.pm:218
-#: ../lib/network/netconnect.pm:471
-#: ../lib/network/netconnect.pm:567
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:197
+#: ../lib/network/netconnect.pm:200 ../lib/network/netconnect.pm:218
+#: ../lib/network/netconnect.pm:471 ../lib/network/netconnect.pm:567
 #: ../lib/network/netconnect.pm:570
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Нет в списке - отредактируйте вручную"
 
-#: ../lib/network/connection/isdn.pm:196
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "I do not know"
 msgstr "Я не знаю"
 
-#: ../lib/network/connection/isdn.pm:197
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198
-#: ../lib/network/netconnect.pm:403
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:403
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -4905,16 +4789,24 @@ msgstr "Закрытый WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Pre-Shared Ключ"
 
-#: ../lib/network/connection/wireless.pm:197
-#: ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Для этого устройства нужны файлы встроенного ПО."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Ваша карта беспроводной связи отключена. Включите её сначала (переключатель RF)."
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
+#, c-format
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Ваша карта беспроводной связи отключена. Включите её сначала (переключатель "
+"RF)."
 
 #: ../lib/network/connection/wireless.pm:322
 #, c-format
@@ -4956,14 +4848,68 @@ msgstr "Авто"
 msgid "Encryption mode"
 msgstr "Режим шифрования"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Логин (имя пользователя)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Пароль"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Имя сертификата"
+
+#: ../lib/network/connection/wireless.pm:399
 #, c-format
 msgid ""
-"RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
-"channel is clear. This adds overhead, but increase performance in case of hidden\n"
+"The complete path and filename of client certificate. 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:408
+#, c-format
+msgid ""
+"RTS/CTS adds a handshake before each packet transmission to make sure that "
+"the\n"
+"channel is clear. This adds overhead, but increase performance in case of "
+"hidden\n"
 "nodes or large number of active nodes. This parameter sets the size of the\n"
 "smallest packet for which the node sends RTS, a value equal to the maximum\n"
-"packet size disable the scheme. You may also set this parameter to auto, fixed\n"
+"packet size disable the scheme. You may also set this parameter to auto, "
+"fixed\n"
 "or off."
 msgstr ""
 "RTS/CTS добавляет handshake перед передачей каждого пакета для проверки\n"
@@ -4978,12 +4924,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set as the hostname).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
+"as the hostname).\n"
 "\n"
 "See iwconfig(8) man page for further information."
 msgstr ""
 "Здесь настраиваются некоторые дополнительные беспроводные параметры:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick уже установлен как hostname).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick уже установлен "
+"как hostname).\n"
 "\n"
 "Читайте iwconfig(8) man страницу для получения подробной информации."
 
@@ -5010,21 +4958,26 @@ msgstr ""
 #: ../lib/network/connection/wireless.pm:369
 #, c-format
 msgid ""
-"iwpriv enable to set up optionals (private) parameters of a wireless network\n"
+"iwpriv enable to set up optionals (private) parameters of a wireless "
+"network\n"
 "interface.\n"
 "\n"
-"iwpriv deals with parameters and setting specific to each driver (as opposed to\n"
+"iwpriv deals with parameters and setting specific to each driver (as opposed "
+"to\n"
 "iwconfig which deals with generic ones).\n"
 "\n"
-"In theory, the documentation of each device driver should indicate how to use\n"
+"In theory, the documentation of each device driver should indicate how to "
+"use\n"
 "those interface specific commands and their effect.\n"
 "\n"
 "See iwpriv(8) man page for further information."
 msgstr ""
-"iwpriv позволяет установить опциональные (собственные) параметры беспроводного сетевого\n"
+"iwpriv позволяет установить опциональные (собственные) параметры "
+"беспроводного сетевого\n"
 "интерфейса\n"
 "\n"
-"iwpriv работает с параметрами и установками, специфичными для каждого драйвера (в то время как\n"
+"iwpriv работает с параметрами и установками, специфичными для каждого "
+"драйвера (в то время как\n"
 "iwconfig работает только с общими параметрами).\n"
 "\n"
 "По теории, в документации к каждому драйверу должно быть описано\n"
@@ -5033,20 +4986,203 @@ msgstr ""
 "\n"
 "Читайте iwpriv(8) man страницу для получения подробной информации."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Автоопределение"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Режим"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Сертификат"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Нужен ключ шифрования."
 
 #: ../lib/network/connection/wireless.pm:393
 #, 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 "Freq (частота) должна иметь суффикс k, M или G (например, \"2.46G\" для частоты 2.46 ГГц), или добавьте нужное количество '0' (нулей)."
+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 ""
+"Freq (частота) должна иметь суффикс k, M или G (например, \"2.46G\" для "
+"частоты 2.46 ГГц), или добавьте нужное количество '0' (нулей)."
 
 #: ../lib/network/connection/wireless.pm:399
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Rate должна иметь суффикс k, M или G (например, \"11M\" для 11M), или добавьте нужное количество '0' (нулей)."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Rate должна иметь суффикс k, M или G (например, \"11M\" для 11M), или "
+"добавьте нужное количество '0' (нулей)."
 
 #: ../lib/network/connection/wireless.pm:411
 #, c-format
@@ -5068,8 +5204,7 @@ msgstr "Потеряна связь с беспроводной сетью на
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:76
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:763
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "USB-модем speedtouch от Alcatel"
@@ -5077,18 +5212,24 @@ msgstr "USB-модем speedtouch от Alcatel"
 #: ../lib/network/connection/xdsl.pm:104
 #, c-format
 msgid ""
-"The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n"
+"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
+"problem.\n"
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
-"Модем ECI Hi-Focus не поддерживается вследствие проблем с распространением драйверов в бинарном виде.\n"
+"Модем ECI Hi-Focus не поддерживается вследствие проблем с распространением "
+"драйверов в бинарном виде.\n"
 "\n"
 "Драйвер можно найти на http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:164
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Модемы Conexant с чипсетом AccessRunner не поддерживаются из-за проблем с распространением встроенного ПО в двоичном формате."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Модемы Conexant с чипсетом AccessRunner не поддерживаются из-за проблем с "
+"распространением встроенного ПО в двоичном формате."
 
 #: ../lib/network/connection/xdsl.pm:184
 #, c-format
@@ -5131,10 +5272,8 @@ msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
 #: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:41
-#: ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:131
-#: ../lib/network/thirdparty.pm:115
+#: ../lib/network/connection_manager.pm:41 ../lib/network/drakvpn.pm:45
+#: ../lib/network/netconnect.pm:131 ../lib/network/thirdparty.pm:115
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "Невозможно установить пакеты (%s )!"
@@ -5151,8 +5290,7 @@ msgstr "Параметры сети"
 msgid "Please enter settings for network"
 msgstr "Укажите сетевые параметры"
 
-#: ../lib/network/connection_manager.pm:58
-#: ../lib/network/netconnect.pm:177
+#: ../lib/network/connection_manager.pm:58 ../lib/network/netconnect.pm:177
 #, c-format
 msgid "Configuring device..."
 msgstr "Настраивается устройство..."
@@ -5182,20 +5320,17 @@ msgstr "Мощность сигнала"
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: ../lib/network/connection_manager.pm:244
-#: ../lib/network/netconnect.pm:209
+#: ../lib/network/connection_manager.pm:244 ../lib/network/netconnect.pm:209
 #, c-format
 msgid "Scanning for networks..."
 msgstr "Выполняется сканирование сетей..."
 
-#: ../lib/network/connection_manager.pm:281
-#: ../lib/network/drakroam.pm:111
+#: ../lib/network/connection_manager.pm:281 ../lib/network/drakroam.pm:111
 #, c-format
 msgid "Disconnect"
 msgstr "Отключить"
 
-#: ../lib/network/connection_manager.pm:281
-#: ../lib/network/drakroam.pm:110
+#: ../lib/network/connection_manager.pm:281 ../lib/network/drakroam.pm:110
 #, c-format
 msgid "Connect"
 msgstr "Подключиться"
@@ -5260,8 +5395,7 @@ msgstr "BitTorrent"
 msgid "Port scan detection"
 msgstr "Обнаружение сканирования портов"
 
-#: ../lib/network/drakfirewall.pm:166
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
 #, c-format
 msgid "Firewall configuration"
 msgstr "Настройка файервола"
@@ -5299,8 +5433,7 @@ msgstr ""
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "К каким службам вы хотите разрешить доступ из Интернета?"
 
-#: ../lib/network/drakfirewall.pm:190
-#: ../lib/network/shorewall.pm:145
+#: ../lib/network/drakfirewall.pm:190 ../lib/network/shorewall.pm:145
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
@@ -5349,10 +5482,12 @@ msgstr "Записывать сообщения файерола в систем
 #: ../lib/network/drakfirewall.pm:256
 #, c-format
 msgid ""
-"You can be warned when someone accesses to a service or tries to intrude into your computer.\n"
+"You can be warned when someone accesses to a service or tries to intrude "
+"into your computer.\n"
 "Please select which network activities should be watched."
 msgstr ""
-"Вы можете получить уведомление, когда кто-нибудь обращается к службе или пытается проникнуть в ваш компьютер.\n"
+"Вы можете получить уведомление, когда кто-нибудь обращается к службе или "
+"пытается проникнуть в ваш компьютер.\n"
 "Выберите, за какой сетевой активностью нужно следить."
 
 #: ../lib/network/drakfirewall.pm:261
@@ -5370,20 +5505,17 @@ msgstr "Устройства не найдены"
 msgid "Hostname changed to \"%s\""
 msgstr "Имя хоста изменено на \"%s\""
 
-#: ../lib/network/drakroam.pm:109
-#: ../lib/network/netcenter.pm:72
+#: ../lib/network/drakroam.pm:109 ../lib/network/netcenter.pm:72
 #, c-format
 msgid "Configure"
 msgstr "Настройка"
 
-#: ../lib/network/drakroam.pm:112
-#: ../lib/network/netcenter.pm:77
+#: ../lib/network/drakroam.pm:112 ../lib/network/netcenter.pm:77
 #, c-format
 msgid "Refresh"
 msgstr "Обновить"
 
-#: ../lib/network/drakroam.pm:123
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/drakroam.pm:123 ../lib/network/netconnect.pm:769
 #, c-format
 msgid "Wireless connection"
 msgstr "Беспроводное соединение"
@@ -5401,7 +5533,8 @@ msgstr "Выберите тип VPN"
 #: ../lib/network/drakvpn.pm:49
 #, c-format
 msgid "Initializing tools and detecting devices for %s..."
-msgstr "Выполняется инициализация инструментов и определение устройств для %s..."
+msgstr ""
+"Выполняется инициализация инструментов и определение устройств для %s..."
 
 #: ../lib/network/drakvpn.pm:52
 #, c-format
@@ -5438,8 +5571,7 @@ msgstr "Введите нужные ключи."
 msgid "Please enter the settings of your VPN connection"
 msgstr "Укажите параметры своего VPN-подключения"
 
-#: ../lib/network/drakvpn.pm:94
-#: ../lib/network/netconnect.pm:299
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:299
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr "Хотите установить соединение прямо сейчас?"
@@ -5454,13 +5586,17 @@ msgstr "Сбой подключения."
 msgid ""
 "The VPN connection is now configured.\n"
 "\n"
-"This VPN connection can be automatically started together with a network connection.\n"
-"It can be done by reconfiguring the network connection and selecting this VPN connection.\n"
+"This VPN connection can be automatically started together with a network "
+"connection.\n"
+"It can be done by reconfiguring the network connection and selecting this "
+"VPN connection.\n"
 msgstr ""
 "VPN-подключение успешно настроено.\n"
 "\n"
-"Это VPN-соединение может быть установлено автоматически вместе с сетевым подключением.\n"
-"Этого можно добиться путём повторной настройки сетевого подключения и выбора этого VPN-подключения.\n"
+"Это VPN-соединение может быть установлено автоматически вместе с сетевым "
+"подключением.\n"
+"Этого можно добиться путём повторной настройки сетевого подключения и выбора "
+"этого VPN-подключения.\n"
 
 #: ../lib/network/ifw.pm:129
 #, c-format
@@ -5504,7 +5640,9 @@ msgstr "Обнаружена \" %s\" атака с %s."
 
 #: ../lib/network/ifw.pm:146
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
 msgstr "Приложение \"%s\" пытается открыть службу (%s) для доступа из сети."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
@@ -5513,28 +5651,19 @@ msgstr "Приложение \"%s\" пытается открыть службу
 msgid "port %d"
 msgstr "порт %d"
 
-#: ../lib/network/modem.pm:42
-#: ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44
-#: ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:611
+#: ../lib/network/netconnect.pm:628 ../lib/network/netconnect.pm:644
 #, c-format
 msgid "Manual"
 msgstr "Вручную"
 
-#: ../lib/network/modem.pm:42
-#: ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44
-#: ../lib/network/modem.pm:63
-#: ../lib/network/modem.pm:76
-#: ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110
-#: ../lib/network/netconnect.pm:606
-#: ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:623
-#: ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
+#: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
+#: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:606
+#: ../lib/network/netconnect.pm:611 ../lib/network/netconnect.pm:623
+#: ../lib/network/netconnect.pm:628 ../lib/network/netconnect.pm:644
 #: ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Automatic"
@@ -5555,12 +5684,7 @@ msgstr "Выберите драйвер Windows (файл .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Не удается установить драйвер %s ndiswrapper!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Не удается загрузить модуль ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5569,7 +5693,12 @@ msgstr ""
 "Выбранное устройство уже было настроено на использование драйвера %s.\n"
 "Вы действительно желаете использовать драйвер ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Не удается загрузить модуль ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Не удается найти интерфейс ndiswrapper!"
@@ -5599,8 +5728,7 @@ msgstr "Выбрать устройство:"
 msgid "Network Center"
 msgstr "Сетевой центр"
 
-#: ../lib/network/netcenter.pm:62
-#: ../lib/network/netconnect.pm:212
+#: ../lib/network/netcenter.pm:62 ../lib/network/netconnect.pm:212
 #, c-format
 msgid "Please select your network:"
 msgstr "Выберите свою сеть:"
@@ -5617,8 +5745,7 @@ msgstr "Наблюдать"
 msgid "United States"
 msgstr "Соединенные Штаты"
 
-#: ../lib/network/netconnect.pm:60
-#: ../lib/network/netconnect.pm:501
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:501
 #: ../lib/network/netconnect.pm:515
 #, c-format
 msgid "Manual choice"
@@ -5639,8 +5766,7 @@ msgstr "Протокол для всего остального мира"
 msgid "Choose the connection you want to configure"
 msgstr "Выберите соединение, которое вы хотите настроить"
 
-#: ../lib/network/netconnect.pm:145
-#: ../lib/network/netconnect.pm:356
+#: ../lib/network/netconnect.pm:145 ../lib/network/netconnect.pm:356
 #: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "Select the network interface to configure:"
@@ -5670,8 +5796,7 @@ msgstr ""
 "Выберите протокол своего соединения.\n"
 "Если вы не знаете его, оставьте выбранный протокол."
 
-#: ../lib/network/netconnect.pm:293
-#: ../lib/network/netconnect.pm:663
+#: ../lib/network/netconnect.pm:293 ../lib/network/netconnect.pm:663
 #, c-format
 msgid "Connection control"
 msgstr "Управление соединением"
@@ -5711,8 +5836,7 @@ msgstr "Второй DNS провайдера (опционально)"
 msgid "Card IO_1"
 msgstr "IO_1 карты"
 
-#: ../lib/network/netconnect.pm:359
-#: ../lib/network/netconnect.pm:364
+#: ../lib/network/netconnect.pm:359 ../lib/network/netconnect.pm:364
 #, c-format
 msgid "External ISDN modem"
 msgstr "Внешний модем ISDN"
@@ -5722,10 +5846,8 @@ msgstr "Внешний модем ISDN"
 msgid "Select a device!"
 msgstr "Выберите устройство!"
 
-#: ../lib/network/netconnect.pm:401
-#: ../lib/network/netconnect.pm:411
-#: ../lib/network/netconnect.pm:421
-#: ../lib/network/netconnect.pm:454
+#: ../lib/network/netconnect.pm:401 ../lib/network/netconnect.pm:411
+#: ../lib/network/netconnect.pm:421 ../lib/network/netconnect.pm:454
 #: ../lib/network/netconnect.pm:468
 #, c-format
 msgid "ISDN Configuration"
@@ -5742,7 +5864,8 @@ msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
 msgstr ""
 "\n"
 "Если у вас карта ISA, то значения на следующем экране должны быть верными.\n"
@@ -5766,8 +5889,14 @@ msgstr "Какая из следущих карт ISDN является ваше
 
 #: ../lib/network/netconnect.pm:440
 #, c-format
-msgid "A CAPI driver is available for this modem. This CAPI driver can offer more capabilities than the free driver (like sending faxes). Which driver do you want to use?"
-msgstr "Для этого модема доступен драйвер CAPI. Этот драйвер CAPI может дать больше возможностей чем свободный драйвер (например, посылка факсов). Какой драйвер вы будете использовать?"
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+"Для этого модема доступен драйвер CAPI. Этот драйвер CAPI может дать больше "
+"возможностей чем свободный драйвер (например, посылка факсов). Какой драйвер "
+"вы будете использовать?"
 
 #: ../lib/network/netconnect.pm:454
 #, c-format
@@ -5783,8 +5912,7 @@ msgstr ""
 "Выберите своего провайдера.\n"
 "Если его нет в списке, выберите Unlisted."
 
-#: ../lib/network/netconnect.pm:470
-#: ../lib/network/netconnect.pm:566
+#: ../lib/network/netconnect.pm:470 ../lib/network/netconnect.pm:566
 #, c-format
 msgid "Provider:"
 msgstr "Провайдер:"
@@ -5811,7 +5939,8 @@ msgstr "Модем"
 #: ../lib/network/netconnect.pm:535
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Пожалуйста, выберите, к какому последовательному порту подключен ваш модем."
+msgstr ""
+"Пожалуйста, выберите, к какому последовательному порту подключен ваш модем."
 
 #: ../lib/network/netconnect.pm:564
 #, c-format
@@ -5838,8 +5967,7 @@ msgstr "Номер телефона"
 msgid "Login ID"
 msgstr "ID логина"
 
-#: ../lib/network/netconnect.pm:608
-#: ../lib/network/netconnect.pm:641
+#: ../lib/network/netconnect.pm:608 ../lib/network/netconnect.pm:641
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Dialup: IP параметры"
@@ -5934,25 +6062,30 @@ msgstr ""
 
 #: ../lib/network/netconnect.pm:751
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "После этого мы рекомендуем перезапустить свою среду Х, чтобы избежать проблем, связанных со сменой имени хоста."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"После этого мы рекомендуем перезапустить свою среду Х, чтобы избежать "
+"проблем, связанных со сменой имени хоста."
 
 #: ../lib/network/netconnect.pm:752
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration."
+"Test your connection via net_monitor or mcc. If your connection does not "
+"work, you might want to relaunch the configuration."
 msgstr ""
 "Во время настройки возникли проблемы.\n"
-"Проверьте свое подключение при помощи net_monitor или mcc. Если ваше подключение не работает, вы можете перезапустить настройку."
+"Проверьте свое подключение при помощи net_monitor или mcc. Если ваше "
+"подключение не работает, вы можете перезапустить настройку."
 
 #: ../lib/network/netconnect.pm:764
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB модем"
 
-#: ../lib/network/netconnect.pm:765
-#: ../lib/network/netconnect.pm:766
+#: ../lib/network/netconnect.pm:765 ../lib/network/netconnect.pm:766
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan модем"
@@ -6044,8 +6177,10 @@ msgstr "Имя хоста Zeroconf не должно содержать a ."
 #: ../lib/network/netconnect.pm:787
 #, c-format
 msgid ""
-"Because you are doing a network installation, your network is already configured.\n"
-"Click on Ok to keep your configuration, or cancel to reconfigure your Internet & Network connection.\n"
+"Because you are doing a network installation, your network is already "
+"configured.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
 msgstr ""
 "Поскольку вы производите установку сети, ваша сеть уже настроена.\n"
 "Нажмите ОК, чтобы сохранить текущие настройки, или Отмена, чтобы\n"
@@ -6108,8 +6243,12 @@ msgstr "Настраивается сетевое устройство %s (др�
 
 #: ../lib/network/netconnect.pm:798
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Следующие протоколы можно использовать для настройки LAN соединения.Выберите один, который желаете использовать."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Следующие протоколы можно использовать для настройки LAN соединения.Выберите "
+"один, который желаете использовать."
 
 #: ../lib/network/netconnect.pm:799
 #, c-format
@@ -6155,8 +6294,12 @@ msgstr "Настройка прокси"
 
 #: ../lib/network/network.pm:430
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Здесь вы можете настроить свой прокси-сервер (напр: http://my_caching_server:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Здесь вы можете настроить свой прокси-сервер (напр: http://"
+"my_caching_server:8080)"
 
 #: ../lib/network/network.pm:431
 #, c-format
@@ -6239,7 +6382,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:135
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Отсутствуют некоторые компоненты (%s), необходимые для оборудования %s."
+msgstr ""
+"Отсутствуют некоторые компоненты (%s), необходимые для оборудования %s."
 
 #: ../lib/network/thirdparty.pm:136
 #, c-format
@@ -6248,8 +6392,12 @@ msgstr "Отсутствуют некоторые необходимые пак�
 
 #: ../lib/network/thirdparty.pm:138
 #, c-format
-msgid "These packages can be found in Mandriva Club or in Mandriva commercial releases."
-msgstr "Данные пакеты можно найти в Клубе Mandriva или в коммерческих релизах Mandriva."
+msgid ""
+"These packages can be found in Mandriva Club or in Mandriva commercial "
+"releases."
+msgstr ""
+"Данные пакеты можно найти в Клубе Mandriva или в коммерческих релизах "
+"Mandriva."
 
 #: ../lib/network/thirdparty.pm:139
 #, c-format
@@ -6265,14 +6413,17 @@ msgstr ""
 "Также необходимые файлы можно найти по этому URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178
-#: ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Для этого устройства нужны файлы встроенного ПО."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Использовать дискету"
 
-#: ../lib/network/thirdparty.pm:179
-#: ../lib/network/thirdparty.pm:186
+#: ../lib/network/thirdparty.pm:179 ../lib/network/thirdparty.pm:186
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Использовать раздел Windows"
@@ -6304,8 +6455,12 @@ msgstr "Вставьте дискету"
 
 #: ../lib/network/thirdparty.pm:228
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Вставьте отформатированную под FAT дискету в дисковод %s с %s в корневом каталоге и нажмите %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Вставьте отформатированную под FAT дискету в дисковод %s с %s в корневом "
+"каталоге и нажмите %s"
 
 #: ../lib/network/thirdparty.pm:228
 #, c-format
@@ -6463,6 +6618,8 @@ msgstr "Использовать инкапсуляцию Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Использовать определённый порт UDP"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Не удалось добавить принтеры."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Получить помощь в онлайне"
-
diff --git a/po/sc.po b/po/sc.po
index 6e45274..ac4e52b 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-sc\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-09-14 11:29+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -1982,12 +1982,7 @@ msgstr "Cumprimentus"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2363,12 +2358,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2433,7 +2423,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Umperadoris Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4296,12 +4298,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4348,7 +4355,58 @@ msgstr ""
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Nòmini umperadori"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Password"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4402,7 +4460,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocollu"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automàtigu"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modem"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4888,19 +5121,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5557,7 +5790,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Imprea unu floppy"
diff --git a/po/sk.po b/po/sk.po
index e84f6f4..65406c2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-09-21 14:03+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
@@ -2091,12 +2091,7 @@ msgstr "Gratulujeme"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Sprievodca úspešne pridal zdieľanie tlačiarne cez Samba"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Chyba pri pridávaní tlačiarní."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2477,12 +2472,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sprievodca úspešne pridal zdieľanie tlačiarne cez Samba"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Chyba pri modifikovaní Samba zdieľaného prostriedku."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2547,7 +2537,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba používatelia"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Chyba pri modifikovaní Samba zdieľaného prostriedku."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba pre menežovanie Samba zdieľaných prostriedkov"
@@ -4752,12 +4754,17 @@ msgstr "WEP s reštrikciami"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA zdieľaný kľúč"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4804,7 +4811,58 @@ msgstr "Automaticky"
 msgid "Encryption mode"
 msgstr "Mód šifrovania"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Meno účtu (používateľské meno)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Heslo"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Meno certifikátu"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4890,7 +4948,182 @@ msgstr ""
 "\n"
 "Prezrite si manuálovú stránku iwpriv(8) pre ďalšie podrobnosti."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-detekcia"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mód"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Typ certifikátu"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5403,12 +5636,7 @@ msgstr "Vyberte si Windows ovládač (.inf súbor)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Nie je možné nainštalovať %s ndiswrapper ovládač!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Nie je možné načítať ndiswrapper modul!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5417,7 +5645,12 @@ msgstr ""
 "Vybrané zariadenie už bolo nastavené pomocou ovládača %s.\n"
 "Naozaj si želáte použiť ovládač ndiswrapper ?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Nie je možné načítať ndiswrapper modul!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Nie je možné nájsť ndiswrapper rozhranie!"
@@ -6118,7 +6351,12 @@ msgstr ""
 "Vyžadované súbory je možné nainštalovať z URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Použiť disketu"
@@ -6318,5 +6556,8 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr ""
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Chyba pri pridávaní tlačiarní."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Získanie online pomoci"
diff --git a/po/sl.po b/po/sl.po
index ab0213e..fca7242 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-29 16:05+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
 
 #: ../bin/drakconnect:61 ../lib/network/netconnect.pm:118
 #, c-format
@@ -580,7 +581,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Omrežna naprava »%s« je bila uspešno odstranjena"
 
 #: ../bin/drakconnect:769
@@ -802,7 +804,8 @@ msgstr "Ponovno nastavi"
 #: ../bin/drakgw:122
 #, c-format
 msgid "Please select the network interface directly connected to the internet."
-msgstr "Prosimo, izberite omrežni vmesnik, ki je neposredno povezan z medmrežjem"
+msgstr ""
+"Prosimo, izberite omrežni vmesnik, ki je neposredno povezan z medmrežjem"
 
 #: ../bin/drakgw:141
 #, c-format
@@ -824,7 +827,8 @@ msgstr ""
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
-msgstr "Prosim izberite, kateri mrežni vmesnik bo povezan z vašim krajevnim omrežjem."
+msgstr ""
+"Prosim izberite, kateri mrežni vmesnik bo povezan z vašim krajevnim omrežjem."
 
 #: ../bin/drakgw:173
 #, c-format
@@ -1328,7 +1332,8 @@ msgstr "Nov profil ..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Ime profila, ki naj se ustvari (nov profil je narejen kot kopija trenutnega):"
+msgstr ""
+"Ime profila, ki naj se ustvari (nov profil je narejen kot kopija trenutnega):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -2065,7 +2070,8 @@ msgstr "Nastavi tiskalnik za deljenje"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Cilj tega čarovnika je preprosto nastavljanje tiskalnikov, ki bodo deljeni "
 "prek Sambe."
@@ -2090,12 +2096,7 @@ msgstr "Čestitke"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Čarovnik je uspešno nastavil tiskalnik za deljenje prek Sambe"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Dodajanje tiskalnika je spodletelo."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2175,7 +2176,8 @@ msgstr "Vnos DrakSamba"
 #: ../bin/draksambashare:705
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Prosim dodajte ali izberite mapo deljeno prek Sambe, da jo lahko nastavljate."
+msgstr ""
+"Prosim dodajte ali izberite mapo deljeno prek Sambe, da jo lahko nastavljate."
 
 #: ../bin/draksambashare:728
 #, c-format
@@ -2209,7 +2211,8 @@ msgstr "Javno:"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Maska za ustvarjanje in za mape ter način za ustvarjanje naj bodo številski. "
 "Na primer: 0755."
@@ -2265,9 +2268,8 @@ msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"Samba omogoča, da vaš strežnik deluje kot "
-"tiskalniški in datotečni strežnik za sisteme, "
-"ki ne poganjajo Linuxa."
+"Samba omogoča, da vaš strežnik deluje kot tiskalniški in datotečni strežnik "
+"za sisteme, ki ne poganjajo Linuxa."
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2280,15 +2282,16 @@ msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr ""
-"Strežnik, ki je nastavljen kot PDC, je odgovoren "
-"za Windows overjanje po celotni domeni."
+"Strežnik, ki je nastavljen kot PDC, je odgovoren za Windows overjanje po "
+"celotni domeni."
 
 #: ../bin/draksambashare:1082
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
-"Samostojni strežniki lahko za gesla uporabljajo "
-"hrbtenico smbpasswd ali tdbsam"
+"Samostojni strežniki lahko za gesla uporabljajo hrbtenico smbpasswd ali "
+"tdbsam"
 
 #: ../bin/draksambashare:1082
 #, c-format
@@ -2296,9 +2299,8 @@ msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
-"Glavni v domeni = da povzroči, da strežnik "
-"registrira ime NetBIOS <ime pdc>. To ime "
-"potem prepoznajo ostali strežniki."
+"Glavni v domeni = da povzroči, da strežnik registrira ime NetBIOS <ime pdc>. "
+"To ime potem prepoznajo ostali strežniki."
 
 #: ../bin/draksambashare:1099
 #, c-format
@@ -2329,13 +2331,10 @@ msgid ""
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
 msgstr ""
-"Globalni nivo OS določa nivo operacijskega "
-"sistema, pod katerim se predstavlja Samba "
-"med izbiranjem brskalnika. Če želite, da bo "
-"izbrana Samba in tako postala glavni brskalnik, "
-"nastavite nivo višje, kakršnega že imajo "
-"operacijski sistemi, ki so trenutno v omrežju. "
-"Na primer na 34."
+"Globalni nivo OS določa nivo operacijskega sistema, pod katerim se "
+"predstavlja Samba med izbiranjem brskalnika. Če želite, da bo izbrana Samba "
+"in tako postala glavni brskalnik, nastavite nivo višje, kakršnega že imajo "
+"operacijski sistemi, ki so trenutno v omrežju. Na primer na 34."
 
 #: ../bin/draksambashare:1105
 #, c-format
@@ -2350,9 +2349,7 @@ msgstr "Delovna skupina"
 #: ../bin/draksambashare:1112
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr ""
-"Samba mora vedeti, kateri delovni skupini "
-"Windows bo stregla."
+msgstr "Samba mora vedeti, kateri delovni skupini Windows bo stregla."
 
 #: ../bin/draksambashare:1119 ../bin/draksambashare:1183
 #, c-format
@@ -2380,17 +2377,13 @@ msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
 msgstr ""
-"Uporabniški nivo: takoj po pogajanju glede "
-"protokola odjemalec pošlje zahtevek "
-"za nastavitev seje. Ta zahtevek vsebuje "
-"uporabniško ime in geslo."
+"Uporabniški nivo: takoj po pogajanju glede protokola odjemalec pošlje "
+"zahtevek za nastavitev seje. Ta zahtevek vsebuje uporabniško ime in geslo."
 
 #: ../bin/draksambashare:1131
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr ""
-"Nivo souporabe: za vsak vir v souporabi se "
-"odjemalec overi posebej"
+msgstr "Nivo souporabe: za vsak vir v souporabi se odjemalec overi posebej"
 
 #: ../bin/draksambashare:1131
 #, c-format
@@ -2399,10 +2392,9 @@ msgid ""
 "in a central, shared, account repository. The centralized account repository "
 "is shared between domain (security) controllers."
 msgstr ""
-"Nivo domene: ponuja mehanizem za shranjevanje "
-"vseh uporabnikov in skupin v osrednjem "
-"skladišču, ki je v souporabi. Osrednje skladišče "
-"uporabljajo nadzorniki domene (varnosti)."
+"Nivo domene: ponuja mehanizem za shranjevanje vseh uporabnikov in skupin v "
+"osrednjem skladišču, ki je v souporabi. Osrednje skladišče uporabljajo "
+"nadzorniki domene (varnosti)."
 
 #: ../bin/draksambashare:1142
 #, c-format
@@ -2419,9 +2411,7 @@ msgstr "Opis strežnika."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr ""
-"Kako bo strežnik opisan delovnim postajam z "
-"Windows."
+msgstr "Kako bo strežnik opisan delovnim postajam z Windows."
 
 #: ../bin/draksambashare:1152
 #, c-format
@@ -2444,23 +2434,18 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Dnevniška datoteka: uporabite datoteka.%m, da "
-"za vsak računalnik, ki se poveže, uporabite "
-"svojo dnevniško datoteko"
+"Dnevniška datoteka: uporabite datoteka.%m, da za vsak računalnik, ki se "
+"poveže, uporabite svojo dnevniško datoteko"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr ""
-"Nivo dnevnika: nastavite nivo (zgovornost) "
-"dnevnika (od 0 do 10)"
+msgstr "Nivo dnevnika: nastavite nivo (zgovornost) dnevnika (od 0 do 10)"
 
 #: ../bin/draksambashare:1163
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr ""
-"Najv. velikost dnevnika: omejite velikost datoteke "
-"dnevnika (v KiB)."
+msgstr "Najv. velikost dnevnika: omejite velikost datoteke dnevnika (v KiB)."
 
 #: ../bin/draksambashare:1170 ../bin/draksambashare:1185
 #, c-format
@@ -2480,9 +2465,7 @@ msgstr "Nivo dnevnika:"
 #: ../bin/draksambashare:1177
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr ""
-"Čarovnik je za nastavitev Sambe zbral sledeče "
-"parametre."
+msgstr "Čarovnik je za nastavitev Sambe zbral sledeče parametre."
 
 #: ../bin/draksambashare:1177
 #, c-format
@@ -2490,9 +2473,8 @@ msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
-"Za nastavitev strežnika s temi parametri kliknite "
-"gumb Naprej. Če želite popraviti nastavitve, "
-"kliknite gumb Nazaj."
+"Za nastavitev strežnika s temi parametri kliknite gumb Naprej. Če želite "
+"popraviti nastavitve, kliknite gumb Nazaj."
 
 #: ../bin/draksambashare:1177
 #, c-format
@@ -2500,10 +2482,8 @@ msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
-"Če ste prej že dali kaj v souporabo, bo to "
-"vključeno v to nastavitev. Za upravljanje "
-"virov v souporabi poženite »drakwizard "
-"sambashare«."
+"Če ste prej že dali kaj v souporabo, bo to vključeno v to nastavitev. Za "
+"upravljanje virov v souporabi poženite »drakwizard sambashare«."
 
 #: ../bin/draksambashare:1182
 #, c-format
@@ -2520,12 +2500,7 @@ msgstr "Opis strežnika:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "Čarovnik je uspešno nastavil vaš strežnik Samba."
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr "Nastavljanje strežnika Samba je spodletelo."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Čarovnik za Sambo je spodletel nepričakovano:"
@@ -2590,7 +2565,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Uporabniki Sambe"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Nastavljanje strežnika Samba je spodletelo."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba upravlja mape in tiskalnike deljene prek Sambe"
@@ -4407,7 +4394,8 @@ msgstr "Omrežni naslov na vmesniku  %s (protokol %s) je bil pridobljen."
 #: ../lib/network/connection/ethernet.pm:278
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Pridobivanje omrežnega naslova na vmesniku  %s (protokol %s) je spodletelo."
+msgstr ""
+"Pridobivanje omrežnega naslova na vmesniku  %s (protokol %s) je spodletelo."
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -4791,12 +4779,17 @@ msgstr "Omejen WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA, v naprej deljen ključ"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Ta naprava potrebuje strojne gonilnike (firmware)."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4845,7 +4838,58 @@ msgstr "Samodejno"
 msgid "Encryption mode"
 msgstr "Način šifriranja"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Uporabniško ime za prijavo"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Geslo"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Ime certifikata"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4929,7 +4973,182 @@ msgstr ""
 "\n"
 "Več o tem v priročniku za iwpriv (man impriv)."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Samodejna zaznava"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Način"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "Potrebujete šifrirni ključ."
@@ -4939,7 +5158,8 @@ msgstr "Potrebujete šifrirni ključ."
 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 "Frekvenca mora imeti predpono k, M ali G oziroma zadostno število ničel."
+msgstr ""
+"Frekvenca mora imeti predpono k, M ali G oziroma zadostno število ničel."
 
 #: ../lib/network/connection/wireless.pm:399
 #, c-format
@@ -5445,12 +5665,7 @@ msgstr "Izberite gonilnik za Windows (datoteko .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Ni moč namestiti gonilnika %s ndiswrapper!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Ni moč naložiti modula ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5459,7 +5674,12 @@ msgstr ""
 "Izbrana naprava je že nastavljena z gonilnikom %s.\n"
 "Ste prepričani, da želite uporabo gonilnika ndiswrapper?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Ni moč naložiti modula ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Ni moč najti vmesnika ndiswrapper!"
@@ -6153,7 +6373,8 @@ msgstr "Potrebni so nekateri paketi (%s), ki pa niso na voljo."
 msgid ""
 "These packages can be found in Mandriva Club or in Mandriva commercial "
 "releases."
-msgstr "Te pakete lahko najdete v Klubu Mandriva ali v komercialnih izdajah Mandrive."
+msgstr ""
+"Te pakete lahko najdete v Klubu Mandriva ali v komercialnih izdajah Mandrive."
 
 #: ../lib/network/thirdparty.pm:139
 #, c-format
@@ -6169,7 +6390,12 @@ msgstr ""
 "Potrebne pakete je moč dobiti tudi na tem naslovu:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Ta naprava potrebuje strojne gonilnike (firmware)."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Uporabi disketo"
@@ -6369,3 +6595,5 @@ msgstr "Uporabi zaščito podatkov Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Uporabi določena vrata UDP"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Dodajanje tiskalnika je spodletelo."
diff --git a/po/sq.po b/po/sq.po
index 2b1a6fb..e758b98 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net for MDK 9.2\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -2035,12 +2035,7 @@ msgstr "Urime"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2416,12 +2411,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2486,7 +2476,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4354,12 +4356,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4406,7 +4413,58 @@ msgstr "Automatike"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Emri i përdoruesit të kontos"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parulla"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4460,7 +4518,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoli"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-zbulues"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modaliteti"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4966,19 +5199,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5667,7 +5900,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Përdore një disketë floppy"
diff --git a/po/sr.po b/po/sr.po
index c233ca3..5151257 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -2027,12 +2027,7 @@ msgstr "Честитке"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2408,12 +2403,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2478,7 +2468,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4346,12 +4348,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4398,7 +4405,58 @@ msgstr "Аутоматски"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Логовање за рачун (корисничко име)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Лозинка"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4452,7 +4510,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Ауто-детекција"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Начин рада"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4957,19 +5190,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5659,7 +5892,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Сними на дискету"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2227049..a9ed45a 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:34+0200\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -2027,12 +2027,7 @@ msgstr "Čestitke"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2408,12 +2403,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2478,7 +2468,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4346,12 +4348,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4398,7 +4405,58 @@ msgstr "Automatski"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Logovanje za račun (korisničko ime)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Lozinka"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4452,7 +4510,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto-detekcija"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Način rada"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4957,19 +5190,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5659,7 +5892,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Snimi na disketu"
diff --git a/po/sv.po b/po/sv.po
index de54c0a..6d5b64a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools-sv\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2008-02-28 01:37+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -584,7 +584,8 @@ msgstr ""
 
 #: ../bin/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Gratulerar, nätverksgränssnittet \"%s\" togs bort utan problem"
 
 #: ../bin/drakconnect:769
@@ -1761,7 +1762,8 @@ msgstr "Misslyckades att ta bort NFS utdelning."
 #: ../bin/drakproxy:36
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Du måste logga ut och logga in igen för att ändringarna ska verkställas."
+msgstr ""
+"Du måste logga ut och logga in igen för att ändringarna ska verkställas."
 
 #: ../bin/draksambashare:64
 #, c-format
@@ -2079,8 +2081,10 @@ msgstr "Lägg till en Speciell Skrivarutdelning."
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Målet med denna guide är att enkelt skapa en ny Samba skrivarutdelning."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Målet med denna guide är att enkelt skapa en ny Samba skrivarutdelning."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -2102,15 +2106,11 @@ msgstr "Gratulerar"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Guiden lyckades lägga till Samba skrivarutdelningen."
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Tillägg av skrivare misslyckades."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Lägg till eller välj en Samba skrivarutdelning för att kunna ändra den."
+msgstr ""
+"Lägg till eller välj en Samba skrivarutdelning för att kunna ändra den."
 
 #: ../bin/draksambashare:579
 #, c-format
@@ -2219,7 +2219,8 @@ msgstr "Publik;"
 
 #: ../bin/draksambashare:805
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Maskering för skapande, skaparläge och kataloger skall vara numerisk, dvs: "
 "0755."
@@ -2250,14 +2251,12 @@ msgid "Password:"
 msgstr "Lösenord:"
 
 #: ../bin/draksambashare:1056
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "PDC - primary domain controller"
 msgstr "primär"
 
 #: ../bin/draksambashare:1057
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Standalone - standalone server"
 msgstr "server"
 
@@ -2272,36 +2271,32 @@ msgid "Samba server configuration Wizard"
 msgstr "Samba server Guide"
 
 #: ../bin/draksambashare:1066
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr "Samba server server startad Linux."
 
 #: ../bin/draksambashare:1082
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "PDC server: primary domain controller"
 msgstr "server primär"
 
 #: ../bin/draksambashare:1082
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr "Server konfigurerad Windows."
 
 #: ../bin/draksambashare:1082
-#, c-format
-#, fuzzy
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+#, fuzzy, c-format
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr "server eller"
 
 #: ../bin/draksambashare:1082
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
@@ -2323,14 +2318,12 @@ msgid "root @adm"
 msgstr ""
 
 #: ../bin/draksambashare:1101
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Os level:"
 msgstr "nivå:"
 
 #: ../bin/draksambashare:1101
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
 "Samba will masquerade during a browser election. If you wish to have Samba "
@@ -2350,8 +2343,7 @@ msgid "Workgroup"
 msgstr "Arbetsgrupp"
 
 #: ../bin/draksambashare:1112
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba Windows Arbetsgrupp."
 
@@ -2366,8 +2358,7 @@ msgid "Netbios name:"
 msgstr "Maskinnamn:"
 
 #: ../bin/draksambashare:1124
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The Workgroup is wrong."
 msgstr "Arbetsgrupp."
 
@@ -2377,22 +2368,19 @@ msgid "Security mode"
 msgstr "Säkerhet"
 
 #: ../bin/draksambashare:1131
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
 msgstr "Användare nivå."
 
 #: ../bin/draksambashare:1131
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr "Dela ut nivå"
 
 #: ../bin/draksambashare:1131
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
 "in a central, shared, account repository. The centralized account repository "
@@ -2405,14 +2393,12 @@ msgid "Hosts allow"
 msgstr "Värddatornamn"
 
 #: ../bin/draksambashare:1147
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Server Banner."
 msgstr "Server."
 
 #: ../bin/draksambashare:1147
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2424,8 +2410,7 @@ msgid "Banner:"
 msgstr ""
 
 #: ../bin/draksambashare:1156
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The Server Banner is incorrect."
 msgstr "Server."
 
@@ -2435,22 +2420,19 @@ msgid "Samba Log"
 msgstr "Samba Logg"
 
 #: ../bin/draksambashare:1163
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr "Logg"
 
 #: ../bin/draksambashare:1163
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr "Logg nivå nivå nivå"
 
 #: ../bin/draksambashare:1163
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr "Logg."
 
@@ -2470,14 +2452,12 @@ msgid "Log level:"
 msgstr "Logg nivå:"
 
 #: ../bin/draksambashare:1177
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Samba."
 
 #: ../bin/draksambashare:1177
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2496,8 +2476,7 @@ msgid "Samba type:"
 msgstr "Samba:"
 
 #: ../bin/draksambashare:1184
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Server banner:"
 msgstr "Server:"
 
@@ -2506,14 +2485,8 @@ msgstr "Server:"
 msgid "The wizard successfully configured your Samba server."
 msgstr "konfigurerad Samba server."
 
-#: ../bin/draksambashare:1213
+#: ../bin/draksambashare:1246
 #, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Misslyckades Samba server."
-
-#: ../bin/draksambashare:1263
-#, c-format
-#, fuzzy
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba:"
 
@@ -2577,7 +2550,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba Användare"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Misslyckades Samba server."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba hanterar Samba utdelningar"
@@ -2588,14 +2573,12 @@ msgid "DrakVPN"
 msgstr "DrakVPN"
 
 #: ../bin/drakvpn-old:87
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The VPN connection is enabled."
 msgstr "VPN."
 
 #: ../bin/drakvpn-old:88
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -2620,26 +2603,22 @@ msgid "dismiss"
 msgstr ""
 
 #: ../bin/drakvpn-old:97
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Disabling VPN..."
 msgstr "VPN."
 
 #: ../bin/drakvpn-old:106
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The VPN connection is now disabled."
 msgstr "VPN inaktiverad."
 
 #: ../bin/drakvpn-old:113
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "VPN connection currently disabled"
 msgstr "VPN inaktiverad"
 
 #: ../bin/drakvpn-old:114
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -2654,26 +2633,22 @@ msgid "enable"
 msgstr ""
 
 #: ../bin/drakvpn-old:127
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Enabling VPN..."
 msgstr "VPN."
 
 #: ../bin/drakvpn-old:133
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "The VPN connection is now enabled."
 msgstr "VPN."
 
 #: ../bin/drakvpn-old:147 ../bin/drakvpn-old:164
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Simple VPN setup."
 msgstr "VPN."
 
 #: ../bin/drakvpn-old:148
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to use a VPN connection.\n"
 "\n"
@@ -2686,11 +2661,11 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
-msgstr "VPN annan server Internet Internet server konfigurerad Nätverk Internet."
+msgstr ""
+"VPN annan server Internet Internet server konfigurerad Nätverk Internet."
 
 #: ../bin/drakvpn-old:165
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "VPN connection.\n"
 "\n"
@@ -2717,8 +2692,7 @@ msgid "Problems installing package %s"
 msgstr ""
 
 #: ../bin/drakvpn-old:222
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Security Policies"
 msgstr "Säkerhet"
 
@@ -2728,14 +2702,12 @@ msgid "IKE daemon racoon"
 msgstr ""
 
 #: ../bin/drakvpn-old:224
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configuration file"
 msgstr "Konfiguration"
 
 #: ../bin/drakvpn-old:225
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Configuration step!\n"
 "\n"
@@ -2752,8 +2724,7 @@ msgid "%s entries"
 msgstr ""
 
 #: ../bin/drakvpn-old:246
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
@@ -2794,8 +2765,7 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakvpn-old:272
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The %s file does not exist.\n"
 "\n"
@@ -2805,8 +2775,7 @@ msgid ""
 msgstr "ny"
 
 #: ../bin/drakvpn-old:301
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Add a Security Policy.\n"
 "\n"
@@ -2816,14 +2785,12 @@ msgid ""
 msgstr "Lägg till Säkerhet Säkerhet klar"
 
 #: ../bin/drakvpn-old:333 ../bin/drakvpn-old:523
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Edit section"
 msgstr "Redigera"
 
 #: ../bin/drakvpn-old:334
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
 "\n"
@@ -2838,8 +2805,7 @@ msgid "Section names"
 msgstr ""
 
 #: ../bin/drakvpn-old:344
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
@@ -2849,14 +2815,12 @@ msgid ""
 msgstr "Redigera Säkerhet Säkerhet klar"
 
 #: ../bin/drakvpn-old:353 ../bin/drakvpn-old:570
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Remove section"
 msgstr "Ta bort"
 
 #: ../bin/drakvpn-old:354 ../bin/drakvpn-old:571
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
 "\n"
@@ -2879,8 +2843,7 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakvpn-old:411
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The %s file does not exist\n"
 "\n"
@@ -2895,8 +2858,7 @@ msgid "racoon.conf entries"
 msgstr ""
 
 #: ../bin/drakvpn-old:426
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The 'add' sections step.\n"
 "\n"
@@ -2939,8 +2901,7 @@ msgid "path type"
 msgstr ""
 
 #: ../bin/drakvpn-old:447
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
@@ -2969,8 +2930,7 @@ msgid "real file"
 msgstr ""
 
 #: ../bin/drakvpn-old:490
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Make sure you already have the path sections\n"
 "on the top of your racoon.conf file.\n"
@@ -2980,8 +2940,7 @@ msgid ""
 msgstr "server eller klar"
 
 #: ../bin/drakvpn-old:507
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Make sure you already have the path sections\n"
 "on the top of your %s file.\n"
@@ -2991,8 +2950,7 @@ msgid ""
 msgstr "eller klar"
 
 #: ../bin/drakvpn-old:524
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
 "\n"
@@ -3001,8 +2959,7 @@ msgid ""
 msgstr "eller"
 
 #: ../bin/drakvpn-old:535
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
@@ -3013,8 +2970,7 @@ msgid ""
 msgstr "server klar"
 
 #: ../bin/drakvpn-old:544
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
@@ -3024,8 +2980,7 @@ msgid ""
 msgstr "klar."
 
 #: ../bin/drakvpn-old:552
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "This section has to be on top of your\n"
 "%s file.\n"
@@ -3049,8 +3004,7 @@ msgid "Congratulations!"
 msgstr "Gratulerar!"
 
 #: ../bin/drakvpn-old:600
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
 "\n"
@@ -3168,14 +3122,12 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakvpn-old:686
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "PFS group"
 msgstr "grupp"
 
 #: ../bin/drakvpn-old:688
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
@@ -3243,14 +3195,12 @@ msgid "Encryption algorithm"
 msgstr "Kryperingsalgoritm"
 
 #: ../bin/drakvpn-old:730
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Authentication algorithm"
 msgstr "Autentisering"
 
 #: ../bin/drakvpn-old:732
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Compression algorithm"
 msgstr "Kompression"
 
@@ -3265,8 +3215,7 @@ msgid "Remote"
 msgstr "Server"
 
 #: ../bin/drakvpn-old:741
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
 "specifies the parameters for IKE phase 1 for each remote node.\n"
@@ -3286,8 +3235,7 @@ msgid "Exchange mode"
 msgstr ""
 
 #: ../bin/drakvpn-old:751
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
 "initiator. Also it means the acceptable exchange mode\n"
@@ -3313,8 +3261,7 @@ msgid "on"
 msgstr ""
 
 #: ../bin/drakvpn-old:759
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
 "should set passive on in order that racoon(8) only\n"
@@ -3346,8 +3293,7 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakvpn-old:778
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Certificate type"
 msgstr "Certifikat"
 
@@ -3357,8 +3303,7 @@ msgid "My certfile"
 msgstr ""
 
 #: ../bin/drakvpn-old:781
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Name of the certificate"
 msgstr "Namn"
 
@@ -3368,8 +3313,7 @@ msgid "My private key"
 msgstr ""
 
 #: ../bin/drakvpn-old:783
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Name of the private key"
 msgstr "Namn"
 
@@ -3379,8 +3323,7 @@ msgid "Peers certfile"
 msgstr ""
 
 #: ../bin/drakvpn-old:785
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Name of the peers certificate"
 msgstr "Namn"
 
@@ -3402,8 +3345,7 @@ msgid "My identifier"
 msgstr ""
 
 #: ../bin/drakvpn-old:791
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
 "type to use in the phase 1 negotiation.  address, FQDN,\n"
@@ -3440,8 +3382,7 @@ msgid "Proposal"
 msgstr ""
 
 #: ../bin/drakvpn-old:814
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
@@ -3463,8 +3404,7 @@ msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
 #: ../bin/drakvpn-old:823
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "DH group"
 msgstr "grupp"
 
@@ -3651,8 +3591,7 @@ msgid "Network connection"
 msgstr "Nätverksanslutning"
 
 #: ../bin/net_applet:445
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "More networks"
 msgstr "Mer"
 
@@ -4506,12 +4445,17 @@ msgstr "Skyddad WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA med redan utdelad nyckel"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "Firmware filer behövs för denna enhet."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4560,7 +4504,58 @@ msgstr "Automatisk"
 msgid "Encryption mode"
 msgstr "Krypteringsläge"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Kontoinloggning (användarnamn)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Lösenord"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Namn"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4646,7 +4641,182 @@ msgstr ""
 "\n"
 "Se man-sidan iwpriv(8) för mera information. "
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokoll"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Automatisk identifiering"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Läge"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Certifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "En kypteringsnyckel krävs."
@@ -5126,7 +5296,8 @@ msgstr "En \"%s\" attack har utförts av %s"
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
-msgstr "Programmet \"%s\" försöker göra en tjänst (%s) tillgänglig för nätverket."
+msgstr ""
+"Programmet \"%s\" försöker göra en tjänst (%s) tillgänglig för nätverket."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:150
@@ -5167,12 +5338,7 @@ msgstr "Välj en Windows drivrutin ( .inf fil)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Kunde ej installera %s ndiswrapper drivrutinen."
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Kunde ej ladda ndiswrapper modulen."
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5181,7 +5347,12 @@ msgstr ""
 "Den valda enheten har redan konfigurerats med %s drivrutinen.\n"
 "Vill du verkligen använda en ndiswrapper drivrutin?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Kunde ej ladda ndiswrapper modulen."
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Kunde ej hitta ndiswrapper gränssnittet."
@@ -5748,7 +5919,8 @@ msgstr ""
 #: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "Sist men inte minst kan du också skriva in IP-adresserna för dina DNS-server."
+msgstr ""
+"Sist men inte minst kan du också skriva in IP-adresserna för dina DNS-server."
 
 #: ../lib/network/netconnect.pm:805
 #, c-format
@@ -5892,7 +6064,12 @@ msgstr ""
 "De behövliga paketen kan också installeras från denna URL:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "Firmware filer behövs för denna enhet."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Använd en diskett"
@@ -6092,3 +6269,5 @@ msgstr "Använd Cisco-UDP inkapsling"
 msgid "Use specific UDP port"
 msgstr "Använd en specifik UDP port"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Tillägg av skrivare misslyckades."
diff --git a/po/ta.po b/po/ta.po
index 8309031..3065b10 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 1.0\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2002-09-06 00:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -2017,12 +2017,7 @@ msgstr "வாழ்த்துக்கள்"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2398,12 +2393,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2468,7 +2458,19 @@ msgstr "டிரேக்பயனர்"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4329,12 +4331,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4381,7 +4388,58 @@ msgstr "தானியங்கி"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "பயனர் பெயர்"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "கடவுச்ெசால்"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4435,7 +4493,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "வரைமுறை"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "தன்னியக்க-கண்டுபிடித்தல்"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP-பொதுவாக நம்நாட்டில் இதுதான் உள்ளது"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "முறை"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP-பொதுவாக நம்நாட்டில் இதுதான் உள்ளது"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4936,19 +5169,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5624,7 +5857,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "நெகிழ்வட்டில் சேமியுங்கள்"
diff --git a/po/tg.po b/po/tg.po
index e4c2830..6955c06 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-tg\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-09-17 16:03+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -2049,12 +2049,7 @@ msgstr "Табрикот"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2430,12 +2425,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2500,7 +2490,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4707,12 +4709,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4759,7 +4766,58 @@ msgstr "Худ"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Номи дохилии қайд (исми корванд)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Гузарвожа"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Номи сертификат"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4848,7 +4906,182 @@ msgstr ""
 "\n"
 "Барои маълумоти муфассал ба iwpriv(8) man саҳифа нигаред."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Қарордод"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Автомуаяйнамоӣ"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Усул"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Навъ сертификат"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5361,19 +5594,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6082,7 +6315,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Диски нармро истифода баред"
diff --git a/po/th.po b/po/th.po
index 606555d..5512842 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -1995,12 +1995,7 @@ msgstr "ขอแสดงความยินดี"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2376,12 +2371,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2446,7 +2436,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4308,12 +4310,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4360,7 +4367,58 @@ msgstr "อัตโนมัติ"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Account Login (user name)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "รหัสผ่าน"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4414,7 +4472,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "ตรวจสอบอัตโนมัติ"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "โมเด็ม"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4900,19 +5133,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5586,7 +5819,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
diff --git a/po/tl.po b/po/tl.po
index 416d120..4cb38ab 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-tl\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2004-09-15 13:35+0200\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -2038,12 +2038,7 @@ msgstr "Maligayang bati"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2419,12 +2414,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2489,7 +2479,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4696,12 +4698,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4748,7 +4755,58 @@ msgstr "Auto"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Account Login (user name)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Password"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Pangalan ng certificate"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4839,7 +4897,182 @@ msgstr ""
 "\n"
 "Tingnan ang man page ng iwpriv(8) para sa karagdagang inpormasyon."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Auto na pagtiktik"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Mode"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Uri ng certificate"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5351,19 +5584,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6059,7 +6292,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Gumamit ng floppy"
diff --git a/po/tr.po b/po/tr.po
index bfc1746..8ecad71 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-25 00:46+0300\n"
 "Last-Translator: Taha Özket <taha.ozket@obss.net>\n"
 "Language-Team: Turkce <tr@li.org>\n"
@@ -2039,12 +2039,7 @@ msgstr "Tebrikler"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2420,12 +2415,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2490,7 +2480,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4360,12 +4362,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4412,7 +4419,58 @@ msgstr "Otomatik"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Kullanıcı Adı"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Parola"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, c-format
+msgid "EAP client certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4466,7 +4524,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Otomatik algıla"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Kip"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, c-format
+msgid "EAP CA certificate"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4968,19 +5201,19 @@ msgstr ""
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5666,7 +5899,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Bir disket kullan"
diff --git a/po/uk.po b/po/uk.po
index bafe23c..6d07a70 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-uk\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-03-01 01:29+0200\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -2035,12 +2035,7 @@ msgstr "Вітання"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr ""
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2418,12 +2413,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2488,7 +2478,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr ""
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4690,12 +4692,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4742,7 +4749,58 @@ msgstr "Авто"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Рахунок користувача (ім'я користувача)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Пароль"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Назва сертифікату"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4829,7 +4887,182 @@ msgstr ""
 "\n"
 "Див. сторінку посібника iwpriv(8) для подальшої інформації."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Користуватися автовизначенням"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Режим"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Тип сертифікату"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5341,19 +5574,19 @@ msgstr "Виберіть драйвер Windows (файл .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr ""
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -6054,7 +6287,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Використовувати дискету"
diff --git a/po/uz.po b/po/uz.po
index d2cbeed..971b7fc 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-15 23:45+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -2006,12 +2006,7 @@ msgstr "Tabriklaymiz"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Printerni qo'shish muvaffaqiyatsiz tugadi."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2387,12 +2382,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2457,7 +2447,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba foydalanuvchilari"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4328,12 +4330,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4380,7 +4387,58 @@ msgstr "Avto"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Foydalanuvchi"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Maxfiy so'z"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Sertifikat"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4434,7 +4492,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protokol"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Avto-aniqlash"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Modem"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Sertifikat"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4934,19 +5167,19 @@ msgstr "Iltimos Windows drayverini tanlang (INF-fayli)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "%s ndiswrapper drayverini o'rnatib bo'lmadi."
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "ndiswrapper modulini yuklab bo'lmadi."
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "ndiswrapper modulini yuklab bo'lmadi."
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5634,7 +5867,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Disketdan foydalanish"
@@ -5831,3 +6069,6 @@ msgstr ""
 #, c-format
 msgid "Use specific UDP port"
 msgstr ""
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Printerni qo'shish muvaffaqiyatsiz tugadi."
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index ddab50e..1df5487 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-15 23:45+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -2004,12 +2004,7 @@ msgstr "Табриклаймиз"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Принтерни қўшиш муваффақиятсиз тугади."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2385,12 +2380,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, c-format
-msgid "Failed to configure Samba server."
-msgstr ""
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2455,7 +2445,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Samba фойдаланувчилари"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, c-format
+msgid "Please configure your Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
@@ -4326,12 +4328,17 @@ msgstr ""
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4378,7 +4385,58 @@ msgstr "Авто"
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Фойдаланувчи"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Махфий сўз"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Сертификат"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4432,7 +4490,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Протокол"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Авто-аниқлаш"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Модем"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Сертификат"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -4932,19 +5165,19 @@ msgstr "Илтимос Windows драйверини танланг (INF-файл
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "%s ndiswrapper драйверини ўрнатиб бўлмади."
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "ndiswrapper модулини юклаб бўлмади."
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "ndiswrapper модулини юклаб бўлмади."
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
@@ -5629,7 +5862,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Дискетдан фойдаланиш"
@@ -5826,3 +6064,6 @@ msgstr ""
 #, c-format
 msgid "Use specific UDP port"
 msgstr ""
+
+#~ msgid "Failed to add printers."
+#~ msgstr "Принтерни қўшиш муваффақиятсиз тугади."
diff --git a/po/vi.po b/po/vi.po
index c79d9e0..83d094e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-vi version\n"
 "Report-Msgid-Bugs-To: tmthanh@yahoo.com\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2005-06-02 21:17+0700\n"
 "Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
 "Language-Team:  <gnomevi-list@lists.sourceforge.net>\n"
@@ -2084,12 +2084,7 @@ msgstr "Chúc mừng"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "Đồ thuật đã tạo điểm chia sẻ Samba thành công"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Không thể thêm máy in"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "Vui lòng thêm hoặc chọn điểm chia sẻ máy in để có thể sửa đổi nó."
@@ -2465,12 +2460,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "Đồ thuật đã tạo điểm chia sẻ Samba thành công"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Không thể thay đổi điểm chia sẻ Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2535,7 +2525,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Người dùng của Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Không thể thay đổi điểm chia sẻ Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba quản lý điểm chia sẻ Samba"
@@ -4736,12 +4738,17 @@ msgstr "Restricted WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
+msgid "WPA2/WPA Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4788,7 +4795,58 @@ msgstr "Tự động"
 msgid "Encryption mode"
 msgstr "Phương thức mã hóa"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "Account đăng nhập (tên người dùng)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Mật khẩu"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "Tên chứng thực"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4871,7 +4929,182 @@ msgstr ""
 "dụngcác lệnh đặc biệt và tác dụng của chúng.\n"
 "Xem trang hướng dẫn iwpriv để biết thêm chi tiết."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Giao thức"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Dò tìm Tự động"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Phương thức"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Kiểu chứng thực"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
@@ -5384,12 +5617,7 @@ msgstr "Hãy chọn Windows driver (tập tin .inf)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Không thể cài đặt %s ndiswrapper driver!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Không thể nạp ndiswrapper module!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5398,7 +5626,12 @@ msgstr ""
 "Thiết bị được chọn đã được cấu hình bằng %s driver.\n"
 "Bạn có thật sự muốn dùng ndiswrapper driver không?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Không thể nạp ndiswrapper module!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Không tìm thấy giao diện ndiswrapper!"
@@ -6099,7 +6332,12 @@ msgstr ""
 "Các tập tin cần thiết cũng có thể được cài đặt từ URL này:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr ""
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Dùng đĩa mềm"
@@ -6298,5 +6536,8 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr ""
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Không thể thêm máy in"
+
 #~ msgid "Get Online Help"
 #~ msgstr "Nhận hỗ trợ trực tuyến"
diff --git a/po/wa.po b/po/wa.po
index 46d1677..07c5b20 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-05 23:14+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -2068,12 +2068,7 @@ msgstr "Complumints"
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "Li radjoutaedje des scrireces a fwait berwete."
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
@@ -2449,12 +2444,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "Dji n' a savou candjî l' pårtaedje Samba."
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2519,7 +2509,19 @@ msgstr "Userdrake"
 msgid "Samba Users"
 msgstr "Uzeus Samba"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "Dji n' a savou candjî l' pårtaedje Samba."
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba manaedje les pårtaedjes Samba"
@@ -4408,12 +4410,17 @@ msgstr "WEP rastrindou"
 msgid "WPA Pre-Shared Key"
 msgstr "Clé WPA pré-pårtaedjeye"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "I gn a mezåjhe di fitchîs firmware po cist éndjin ci."
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4462,7 +4469,58 @@ msgstr "Otomatike"
 msgid "Encryption mode"
 msgstr "Môde ecriptaedje"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "No d' elodjaedje do conte (no d' uzeu)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "Sicret"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "No d' l' acertineure"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4538,7 +4596,182 @@ msgstr ""
 "\n"
 "Lijhoz l' pådje di manuel iwpriv(8) po pus di racsegnes."
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "Protocole"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "Deteccion otomatike"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "Môde"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "Acertineure"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje."
@@ -5061,12 +5294,7 @@ msgstr "Tchoezixhoz l' mineu Windows (li fitchî .inf) s' i vs plait"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "Dji n' sai astaler l' mineu ndiswrapper %s!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "Dji n' sai tcherdjî l' module ndiswrapper!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5075,7 +5303,12 @@ msgstr ""
 "L' éndjin tchoezi a ddja stî apontyî avou l' mineu %s.\n"
 "Voloz vs vormint eployî on mineu ndiswrapper al plaece?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "Dji n' sai tcherdjî l' module ndiswrapper!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "Dji n' a savou trover l' eterface ndiswrapper!"
@@ -5789,7 +6022,12 @@ msgstr ""
 "ci:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "I gn a mezåjhe di fitchîs firmware po cist éndjin ci."
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "Eployî ene plakete"
@@ -5991,5 +6229,8 @@ msgstr "Eployî ecapsulaedje Cisco-UDP"
 msgid "Use specific UDP port"
 msgstr "Eployî pôrt UDP specifike"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "Li radjoutaedje des scrireces a fwait berwete."
+
 #~ msgid "Get Online Help"
 #~ msgstr "Lére l' aidance so fyis"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 50c437d..26c2b8b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 2007\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-10 21:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -2063,12 +2063,7 @@ msgstr "恭喜"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "向导成功添加了打印机 Samba 共享"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "添加打印机失败。"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "请添加或选择 Samba 打印机共享，然后再修改。"
@@ -2444,12 +2439,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功添加了打印机 Samba 共享"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "修改 Samba 共享失败。"
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2514,7 +2504,19 @@ msgstr "Drak 用户管理"
 msgid "Samba Users"
 msgstr "Samba 用户"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "修改 Samba 共享失败。"
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 共享"
@@ -4386,12 +4388,17 @@ msgstr "限制 WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 预共享密钥"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "此设备需要固件文件。"
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4438,7 +4445,58 @@ msgstr "自动"
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "账户登录(用户名)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "密码"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "检查服务器证书"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4519,7 +4577,182 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "协议"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "自动检测"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "模式"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "证书"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
@@ -5032,12 +5265,7 @@ msgstr "请选择 Windows 驱动程序(.inf 文件)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "无法安装 %s ndiswrapper 驱动程序!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "无法装入 ndiswrapper 模块!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5046,7 +5274,12 @@ msgstr ""
 "所选的设备已经以 %s 驱动程序配置过。\n"
 "您真的想要使用 ndiswrapper 驱动程序吗?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "无法装入 ndiswrapper 模块!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "找不到 ndiswrapper 接口!"
@@ -5745,7 +5978,12 @@ msgstr ""
 "所需的文件也可从以下 URL 安装:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "此设备需要固件文件。"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "使用软盘"
@@ -5944,3 +6182,6 @@ msgstr "使用 Cisco-UDP 封装"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "添加打印机失败。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cb2f2e..76a59b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2007-09-23 03:01+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -2036,12 +2036,7 @@ msgstr "恭喜"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "精靈已經成功地新增了 Samba 印表機分享"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "無法新增印表機。"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "請新增或選擇一個 Samba 印表機分享來變更它。"
@@ -2417,12 +2412,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "精靈已經成功地新增了 Samba 印表機分享"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "無法變更 Samba 分享。"
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2487,7 +2477,19 @@ msgstr "Userdrake 使用者管理"
 msgid "Samba Users"
 msgstr "Samba 使用者"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "無法變更 Samba 分享。"
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 分享"
@@ -4369,12 +4371,17 @@ msgstr "私有的 WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "這個裝置需要韌體檔案。"
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4421,7 +4428,58 @@ msgstr "自動"
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "帳號登入 (使用者名稱)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "密碼"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "檢查伺服器認證"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. 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:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4475,7 +4533,182 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "通訊協定"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "自動偵測"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, 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
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "模式"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, 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
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "憑證"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要網路金鑰。"
@@ -4990,12 +5223,7 @@ msgstr "請選取 Windows 驅動程式 (.inf 檔)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "無法安裝 %s ndiswrapper 驅動程式！"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "無法載入 ndiswrapper 模組！"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5004,7 +5232,12 @@ msgstr ""
 "選取的裝置已經設定為使用 %s 驅動程式。\n"
 "您確定要使用 ndiswrapper 驅動程式？"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "無法載入 ndiswrapper 模組！"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "無法找到 ndiswrapper 介面！"
@@ -5706,7 +5939,12 @@ msgstr ""
 "需要的檔案也可以由以下的 URL 安裝：\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "這個裝置需要韌體檔案。"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "由磁片安裝"
@@ -5904,5 +6142,8 @@ msgstr ""
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 埠"
 
+#~ msgid "Failed to add printers."
+#~ msgstr "無法新增印表機。"
+
 #~ msgid "Get Online Help"
 #~ msgstr "取得線上說明"